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/cli_installer.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/cli_installer.py')
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 4 |
1 files changed, 2 insertions, 2 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: |