diff options
author | Devan Goodwin <dgoodwin@redhat.com> | 2016-03-23 14:59:18 -0300 |
---|---|---|
committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-03-24 09:07:34 -0300 |
commit | b1479e0f4c2ded50fc68a435b6271a5acbec10e4 (patch) | |
tree | 4275bb0754bc4f483b65ae50d990c9290c43ee99 /utils/src/ooinstall/openshift_ansible.py | |
parent | 6df4b9a58452a0cbecd07099d5f462bab9fb957a (diff) | |
download | openshift-b1479e0f4c2ded50fc68a435b6271a5acbec10e4.tar.gz openshift-b1479e0f4c2ded50fc68a435b6271a5acbec10e4.tar.bz2 openshift-b1479e0f4c2ded50fc68a435b6271a5acbec10e4.tar.xz openshift-b1479e0f4c2ded50fc68a435b6271a5acbec10e4.zip |
Add --gen-inventory command to atomic-openshift-installer.
This will just generate the Ansible inventory once all information is gathered,
inform the user where to find it, and exit.
Includes some test utility updates to make what broke as a result of this
change less fragile.
Diffstat (limited to 'utils/src/ooinstall/openshift_ansible.py')
-rw-r--r-- | utils/src/ooinstall/openshift_ansible.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py index 2b95702bf..edf8082fc 100644 --- a/utils/src/ooinstall/openshift_ansible.py +++ b/utils/src/ooinstall/openshift_ansible.py @@ -213,9 +213,8 @@ def default_facts(hosts, verbose=False): return load_system_facts(inventory_file, os_facts_path, facts_env, verbose) -def run_main_playbook(hosts, hosts_to_run_on, verbose=False): +def run_main_playbook(inventory_file, hosts, hosts_to_run_on, verbose=False): global CFG - inventory_file = generate_inventory(hosts_to_run_on) if len(hosts_to_run_on) != len(hosts): main_playbook_path = os.path.join(CFG.ansible_playbook_directory, 'playbooks/byo/openshift-node/scaleup.yml') |