summaryrefslogtreecommitdiffstats
path: root/utils/src/ooinstall/openshift_ansible.py
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2016-08-12 09:07:25 -0400
committerSamuel Munilla <smunilla@redhat.com>2016-08-12 09:11:21 -0400
commitfe43a8d46b47a103a4daff7d933c61a62ec42e1d (patch)
tree6f530fc922ee96caf49e8fdbef9191707bb33151 /utils/src/ooinstall/openshift_ansible.py
parent16fda8158107f10615bf2685eb8e7c55c1dcda04 (diff)
downloadopenshift-fe43a8d46b47a103a4daff7d933c61a62ec42e1d.tar.gz
openshift-fe43a8d46b47a103a4daff7d933c61a62ec42e1d.tar.bz2
openshift-fe43a8d46b47a103a4daff7d933c61a62ec42e1d.tar.xz
openshift-fe43a8d46b47a103a4daff7d933c61a62ec42e1d.zip
a-o-i: Fix broken upgrades
Upgrade was looking for the hosts in the old location. Quick fix to get it looking in the correct location. Fixes BZ#1357627.
Diffstat (limited to 'utils/src/ooinstall/openshift_ansible.py')
-rw-r--r--utils/src/ooinstall/openshift_ansible.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py
index a121e2e24..ef7906828 100644
--- a/utils/src/ooinstall/openshift_ansible.py
+++ b/utils/src/ooinstall/openshift_ansible.py
@@ -290,12 +290,12 @@ def run_uninstall_playbook(hosts, verbose=False):
return run_ansible(playbook, inventory_file, facts_env, verbose)
-def run_upgrade_playbook(playbook, verbose=False):
+def run_upgrade_playbook(hosts, playbook, verbose=False):
playbook = os.path.join(CFG.settings['ansible_playbook_directory'],
'playbooks/byo/openshift-cluster/upgrades/{}'.format(playbook))
# TODO: Upgrade inventory for upgrade?
- inventory_file = generate_inventory(CFG.hosts)
+ inventory_file = generate_inventory(hosts)
facts_env = os.environ.copy()
if 'ansible_log_path' in CFG.settings:
facts_env['ANSIBLE_LOG_PATH'] = CFG.settings['ansible_log_path']