diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-08 10:16:42 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-08 10:16:42 -0300 |
| commit | 7480a0e06a9a1da029c6564e1e4d7ef60131e6e2 (patch) | |
| tree | 731b1c213bed675608c6e76452a0d4ed415f4416 /playbooks | |
| parent | c1728c8847177988e4532b9c9c777e1a23223410 (diff) | |
| parent | 6ec757e4449fbc59f509f980bd9423bdb35412eb (diff) | |
| download | openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.tar.gz openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.tar.bz2 openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.tar.xz openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.zip | |
Merge branch 'aoi-32-up' into upgrade33
Diffstat (limited to 'playbooks')
3 files changed, 7 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/update_repos_and_packages.yml b/playbooks/common/openshift-cluster/update_repos_and_packages.yml index 0a37d4597..e3d16d359 100644 --- a/playbooks/common/openshift-cluster/update_repos_and_packages.yml +++ b/playbooks/common/openshift-cluster/update_repos_and_packages.yml @@ -5,6 +5,11 @@ vars: openshift_deployment_type: "{{ deployment_type }}" roles: + # Explicitly calling openshift_facts because it appears that when + # rhel_subscribe is skipped that the openshift_facts dependency for + # openshift_repos is also skipped (this is the case at least for Ansible + # 2.0.2) + - openshift_facts - role: rhel_subscribe when: deployment_type in ["enterprise", "atomic-enterprise", "openshift-enterprise"] and ansible_distribution == "RedHat" and diff --git a/playbooks/common/openshift-cluster/upgrades/files/rpm_versions.sh b/playbooks/common/openshift-cluster/upgrades/files/rpm_versions.sh index 8d7543f3c..7bf249742 100644 --- a/playbooks/common/openshift-cluster/upgrades/files/rpm_versions.sh +++ b/playbooks/common/openshift-cluster/upgrades/files/rpm_versions.sh @@ -1,7 +1,7 @@ #!/bin/bash if [ `which dnf 2> /dev/null` ]; then installed=$(dnf repoquery --installed --latest-limit 1 -d 0 --qf '%{version}-%{release}' "${@}" 2> /dev/null) - installed=$(dnf repoquery --available --latest-limit 1 -d 0 --qf '%{version}-%{release}' "${@}" 2> /dev/null) + available=$(dnf repoquery --available --latest-limit 1 -d 0 --qf '%{version}-%{release}' "${@}" 2> /dev/null) else installed=$(repoquery --plugins --pkgnarrow=installed --qf '%{version}-%{release}' "${@}" 2> /dev/null) available=$(repoquery --plugins --pkgnarrow=available --qf '%{version}-%{release}' "${@}" 2> /dev/null) diff --git a/playbooks/common/openshift-loadbalancer/service.yml b/playbooks/common/openshift-loadbalancer/service.yml index 19fffd5e9..e06a14c89 100644 --- a/playbooks/common/openshift-loadbalancer/service.yml +++ b/playbooks/common/openshift-loadbalancer/service.yml @@ -17,4 +17,4 @@ connection: ssh gather_facts: no tasks: - - service: name=hapoxy state="{{ new_cluster_state }}" + - service: name=haproxy state="{{ new_cluster_state }}" |