summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2016-08-19 11:47:10 -0400
committerSamuel Munilla <smunilla@redhat.com>2016-08-23 15:07:56 -0400
commitd7ddfe6fd65aa47dacdd049360ea23aca3be371b (patch)
tree6cfacf8e32594237d8daa47aaa175f2a63402cee
parent7435ce713bbd3018192e3b7287ccfc5bf967e290 (diff)
downloadopenshift-d7ddfe6fd65aa47dacdd049360ea23aca3be371b.tar.gz
openshift-d7ddfe6fd65aa47dacdd049360ea23aca3be371b.tar.bz2
openshift-d7ddfe6fd65aa47dacdd049360ea23aca3be371b.tar.xz
openshift-d7ddfe6fd65aa47dacdd049360ea23aca3be371b.zip
a-o-i: Fix ansible_ssh_user question
Since we moved 'ansible_ssh_user' under 'deployment', we need to update the criteria for when to ask the user to reenter that information.
-rw-r--r--utils/src/ooinstall/cli_installer.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index d677ea8c8..2b070a3d2 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -127,7 +127,7 @@ OpenShift master service to use as the datastore. This can be later replaced
with a separate etcd instance, if required. If multiple masters are specified,
then a separate etcd cluster is configured with each master serving as a member.
-Any masters configured as part of this installation process are also
+Any masters configured as part of this installation process are also
configured as nodes. This enables the master to proxy to pods
from the API. By default, this node is unschedulable, but this can be changed
after installation with the 'oadm manage-node' command.
@@ -604,9 +604,8 @@ https://docs.openshift.com/enterprise/latest/admin_guide/install/prerequisites.h
confirm_continue(message)
click.clear()
- if not oo_cfg.settings.get('ansible_ssh_user', ''):
- oo_cfg.deployment.variables['ansible_ssh_user'] = \
- get_ansible_ssh_user()
+ if not oo_cfg.deployment.variables.get('ansible_ssh_user', False):
+ oo_cfg.deployment.variables['ansible_ssh_user'] = get_ansible_ssh_user()
click.clear()
if not oo_cfg.settings.get('variant', ''):
@@ -1038,7 +1037,7 @@ installation process.
The installation was successful!
If this is your first time installing please take a look at the Administrator
-Guide for advanced options related to routing, storage, authentication, and
+Guide for advanced options related to routing, storage, authentication, and
more:
http://docs.openshift.com/enterprise/latest/admin_guide/overview.html