Merge pull request #980 from brenton/unshedulable

Fixing 'unscheduleable' typo

inventory/byo/hosts.example

@@ -166,7 +166,7 @@ ose3-lb-ansible.test.example.com
 
 # NOTE: Currently we require that masters be part of the SDN which requires that they also be nodes
 # However, in order to ensure that your masters are not burdened with running pods you should
-# make them unschedulable by adding openshift_scheduleable=False any node that's also a master.
+# make them unschedulable by adding openshift_schedulable=False any node that's also a master.
 [nodes]
 ose3-master[1:3]-ansible.test.example.com
 ose3-node[1:2]-ansible.test.example.com openshift_node_labels="{'region': 'primary', 'zone': 'default'}"

utils/src/ooinstall/cli_installer.py

@@ -90,7 +90,7 @@ change this later using etcd from Red Hat Enterprise Linux 7.
 
 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'.
 
 The OpenShift Node provides the runtime environments for containers.  It will
@@ -274,8 +274,8 @@ https://docs.openshift.org/latest/install_config/install/advanced_install.html#m
     if len(masters) == len(nodes):
         message = """
 No dedicated Nodes specified. By default, colocated Masters have their Nodes
-set to unscheduleable.  Continuing at this point will label all nodes as
-scheduleable.
+set to unschedulable.  Continuing at this point will label all nodes as
+schedulable.
 """
         confirm_continue(message)
 

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 = True
+            schedulable = True
             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=True):
+def write_host(host, inventory, schedulable=True):
     global CFG
 
     facts = ''
@@ -126,8 +126,8 @@ def write_host(host, inventory, scheduleable=True):
         facts += ' openshift_public_hostname={}'.format(host.public_hostname)
     # TODO: For not write_host is handles both master and nodes.
     # Technically only nodes will ever need this.
-    if not scheduleable:
-        facts += ' openshift_scheduleable=False'
+    if not schedulable:
+        facts += ' openshift_schedulable=False'
     installer_host = socket.gethostname()
     if installer_host in [host.connect_to, host.hostname, host.public_hostname]:
         facts += ' ansible_connection=local'

utils/test/cli_installer_tests.py

@@ -616,7 +616,7 @@ class AttendedCliTests(OOCliFixture):
 
     #pylint: disable=too-many-arguments,too-many-branches
     def _build_input(self, ssh_user=None, hosts=None, variant_num=None,
-        add_nodes=None, confirm_facts=None, scheduleable_masters_ok=None,
+        add_nodes=None, confirm_facts=None, schedulable_masters_ok=None,
         master_lb=None):
         """
         Builds a CLI input string with newline characters to simulate
@@ -658,7 +658,7 @@ class AttendedCliTests(OOCliFixture):
 
         # TODO: support option 2, fresh install
         if add_nodes:
-            if scheduleable_masters_ok:
+            if schedulable_masters_ok:
                 inputs.append('y')
             inputs.append('1')  # Add more nodes
             i = 0
@@ -712,7 +712,7 @@ class AttendedCliTests(OOCliFixture):
         inventory = ConfigParser.ConfigParser(allow_no_value=True)
         inventory.read(os.path.join(self.work_dir, '.ansible/hosts'))
         self.assertEquals('False',
-            inventory.get('nodes', '10.0.0.1  openshift_scheduleable'))
+            inventory.get('nodes', '10.0.0.1  openshift_schedulable'))
         self.assertEquals(None,
             inventory.get('nodes', '10.0.0.2'))
         self.assertEquals(None,
@@ -790,7 +790,7 @@ class AttendedCliTests(OOCliFixture):
                                       add_nodes=[('10.0.0.2', False)],
                                       ssh_user='root',
                                       variant_num=1,
-                                      scheduleable_masters_ok=True,
+                                      schedulable_masters_ok=True,
                                       confirm_facts='y')
 
         self._verify_get_hosts_to_run_on(mock_facts, load_facts_mock,
@@ -830,13 +830,13 @@ class AttendedCliTests(OOCliFixture):
         inventory = ConfigParser.ConfigParser(allow_no_value=True)
         inventory.read(os.path.join(self.work_dir, '.ansible/hosts'))
         self.assertEquals('False',
-            inventory.get('nodes', '10.0.0.1  openshift_scheduleable'))
+            inventory.get('nodes', '10.0.0.1  openshift_schedulable'))
         self.assertEquals('False',
-            inventory.get('nodes', '10.0.0.2  openshift_scheduleable'))
+            inventory.get('nodes', '10.0.0.2  openshift_schedulable'))
         self.assertEquals(None,
             inventory.get('nodes', '10.0.0.3'))
         self.assertEquals('False',
-            inventory.get('nodes', '10.0.0.4  openshift_scheduleable'))
+            inventory.get('nodes', '10.0.0.4  openshift_schedulable'))
 
         return