diff options
author | Devan Goodwin <dgoodwin@redhat.com> | 2015-12-01 09:43:10 -0400 |
---|---|---|
committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-12-01 09:43:10 -0400 |
commit | b71c3247f1f762b7b99aa081cd9925ecfa4d31e7 (patch) | |
tree | c86cce71d3691386451eb03390676a12f3c52f65 /utils/src/ooinstall/openshift_ansible.py | |
parent | e796856c804cd7090ed45aba7838436e7fdc9580 (diff) | |
parent | ebf659b0c1775f9be3e52a8ef420d568656c10f9 (diff) | |
download | openshift-b71c3247f1f762b7b99aa081cd9925ecfa4d31e7.tar.gz openshift-b71c3247f1f762b7b99aa081cd9925ecfa4d31e7.tar.bz2 openshift-b71c3247f1f762b7b99aa081cd9925ecfa4d31e7.tar.xz openshift-b71c3247f1f762b7b99aa081cd9925ecfa4d31e7.zip |
Merge branch 'master' into loadbalanced-2
Diffstat (limited to 'utils/src/ooinstall/openshift_ansible.py')
-rw-r--r-- | utils/src/ooinstall/openshift_ansible.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py index 866590c49..c5257f1db 100644 --- a/utils/src/ooinstall/openshift_ansible.py +++ b/utils/src/ooinstall/openshift_ansible.py @@ -67,10 +67,10 @@ def generate_inventory(hosts): for node in nodes: # TODO: Until the Master can run the SDN itself we have to configure the Masters # as Nodes too. - scheduleable = None + schedulable = None if node in masters: - scheduleable = False - write_host(node, base_inventory, scheduleable) + schedulable = False + write_host(node, base_inventory, schedulable) if not getattr(proxy, 'preconfigured', True): base_inventory.write('\n[lb]\n') @@ -112,7 +112,7 @@ def write_inventory_vars(base_inventory, multiple_masters, proxy): base_inventory.write("openshift_master_cluster_public_hostname={}\n".format(proxy.public_hostname)) -def write_host(host, inventory, scheduleable=None): +def write_host(host, inventory, schedulable=None): global CFG facts = '' @@ -129,11 +129,11 @@ def write_host(host, inventory, scheduleable=None): # Distinguish between three states, no schedulability specified (use default), # explicitly set to True, or explicitly set to False: - if scheduleable is None: + if schedulable is None: pass - elif scheduleable: + elif schedulable: facts += ' openshift_schedulable=True' - elif not scheduleable: + elif not schedulable: facts += ' openshift_schedulable=False' installer_host = socket.gethostname() |