diff options
author | Samuel Munilla <smunilla@redhat.com> | 2016-07-30 10:14:56 -0400 |
---|---|---|
committer | Samuel Munilla <smunilla@redhat.com> | 2016-08-02 13:58:13 -0400 |
commit | 21d30a9369fedeee5caac9d3b3360324c7aea676 (patch) | |
tree | d122fc8be9ecacf882c15ff36ecd0b8e801ad777 /utils/src/ooinstall/openshift_ansible.py | |
parent | ee9413cebdb8a7c5ff03a5da767b1c74742bc898 (diff) | |
download | openshift-21d30a9369fedeee5caac9d3b3360324c7aea676.tar.gz openshift-21d30a9369fedeee5caac9d3b3360324c7aea676.tar.bz2 openshift-21d30a9369fedeee5caac9d3b3360324c7aea676.tar.xz openshift-21d30a9369fedeee5caac9d3b3360324c7aea676.zip |
a-o-i: Fix broken uninstall
The uninstall method was looking for the host list according to the
old quick-installer config file format. Updated to match the new
arbitrary yaml config format.
Fixes BZ#1359427
Diffstat (limited to 'utils/src/ooinstall/openshift_ansible.py')
-rw-r--r-- | utils/src/ooinstall/openshift_ansible.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py index 54178f0cd..f1e03f8f2 100644 --- a/utils/src/ooinstall/openshift_ansible.py +++ b/utils/src/ooinstall/openshift_ansible.py @@ -279,10 +279,10 @@ def run_ansible(playbook, inventory, env_vars, verbose=False): return subprocess.call(args, env=env_vars) -def run_uninstall_playbook(verbose=False): +def run_uninstall_playbook(hosts, verbose=False): playbook = os.path.join(CFG.settings['ansible_playbook_directory'], 'playbooks/adhoc/uninstall.yml') - 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'] |