From 5994ed458a90b66f4231d43dcbb4b46b51737e89 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Wed, 1 Jun 2016 16:43:47 -0400
Subject: Fix bin/cluster libvirt related error
---
playbooks/common/openshift-cluster/update_repos_and_packages.yml | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'playbooks')
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
--
cgit v1.2.3
From 7ebdbd1e74a38fb892cd0d3ee0ba47ec47c8b010 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Tue, 5 Jul 2016 13:39:08 -0400
Subject: Fix dnf variant of rpm_versions.sh
---
playbooks/common/openshift-cluster/upgrades/files/rpm_versions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'playbooks')
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)
--
cgit v1.2.3
From 7a97f5a7866c7adc03559dd049a61f294d562f73 Mon Sep 17 00:00:00 2001
From: Mathias Merscher <Mathias.Merscher@dg-i.net>
Date: Wed, 6 Jul 2016 14:48:02 +0200
Subject: fix "hapoxy" typo in loadbalancer playbook
Signed-off-by: Mathias Merscher <Mathias.Merscher@dg-i.net>
---
playbooks/common/openshift-loadbalancer/service.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'playbooks')
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 }}"
--
cgit v1.2.3