diff options
Diffstat (limited to 'utils/src')
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 4 | ||||
| -rw-r--r-- | utils/src/ooinstall/openshift_ansible.py | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index f8dfe2feb..ee962c21a 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -101,7 +101,7 @@ separate etcd cluster will be configured with each Master serving as a member. Any Masters configured as part of this installation process will also be configured as Nodes. This is so that the Master will be able to proxy to Pods -from the API. By default this Node will be unscheduleable but this can be changed +from the API. By default this Node will be unschedulable but this can be changed after installation with 'oadm manage-node'. OpenShift Nodes provide the runtime environments for containers. They will @@ -347,7 +347,7 @@ https://docs.openshift.org/latest/install_config/install/advanced_install.html#m if len(dedicated_nodes) == 0: message = """ WARNING: No dedicated Nodes specified. By default, colocated Masters have -their Nodes set to unscheduleable. If you proceed all nodes will be labelled +their Nodes set to unschedulable. If you proceed all nodes will be labelled as schedulable. """ if unattended: 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() |