summaryrefslogtreecommitdiffstats
path: root/utils/src/ooinstall/openshift_ansible.py
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-05 16:38:03 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-05 16:38:03 -0400
commitf13efb21bb48a2202a09d70bf0a0103461b22950 (patch)
tree8286e8f422376c60cef480cc612bed24f031dac9 /utils/src/ooinstall/openshift_ansible.py
parentdebe6109ad57c0d722c41a720dba95a1eb1f3d35 (diff)
parent67d4685ef8885ff3ee759f5a36d9c97ba2012c50 (diff)
downloadopenshift-f13efb21bb48a2202a09d70bf0a0103461b22950.tar.gz
openshift-f13efb21bb48a2202a09d70bf0a0103461b22950.tar.bz2
openshift-f13efb21bb48a2202a09d70bf0a0103461b22950.tar.xz
openshift-f13efb21bb48a2202a09d70bf0a0103461b22950.zip
Merge pull request #1654 from dgoodwin/gen-inventory
Add --gen-inventory command to atomic-openshift-installer.
Diffstat (limited to 'utils/src/ooinstall/openshift_ansible.py')
-rw-r--r--utils/src/ooinstall/openshift_ansible.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py
index 6e43eac9f..28b157e8e 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')