summaryrefslogtreecommitdiffstats
path: root/utils/src/ooinstall/cli_installer.py
diff options
context:
space:
mode:
authorGan Huang <ghuang@redhat.com>2016-08-09 19:25:39 +0800
committerGan Huang <ghuang@redhat.com>2016-08-09 19:25:39 +0800
commit47fbb92cf3727299c06c6c139c813c065494478d (patch)
treecc93e2fe530c98c9d2444e3c7f62da633c029313 /utils/src/ooinstall/cli_installer.py
parent9e0e8485638e36f1bacbd8e1c5df134a5a7595f0 (diff)
downloadopenshift-47fbb92cf3727299c06c6c139c813c065494478d.tar.gz
openshift-47fbb92cf3727299c06c6c139c813c065494478d.tar.bz2
openshift-47fbb92cf3727299c06c6c139c813c065494478d.tar.xz
openshift-47fbb92cf3727299c06c6c139c813c065494478d.zip
move ansible_ssh_user to deployment, remove ansible_config and ansible_log_path
Diffstat (limited to 'utils/src/ooinstall/cli_installer.py')
-rw-r--r--utils/src/ooinstall/cli_installer.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 3a4183630..67eeb97bc 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -490,7 +490,7 @@ def error_if_missing_info(oo_cfg):
'command line or in the config file: %s' % oo_cfg.config_path)
sys.exit(1)
- if 'ansible_ssh_user' not in oo_cfg.settings:
+ if 'ansible_ssh_user' not in oo_cfg.deployment.variables:
click.echo("Must specify ansible_ssh_user in configuration file.")
sys.exit(1)
@@ -586,7 +586,8 @@ https://docs.openshift.com/enterprise/latest/admin_guide/install/prerequisites.h
click.clear()
if not oo_cfg.settings.get('ansible_ssh_user', ''):
- oo_cfg.settings['ansible_ssh_user'] = get_ansible_ssh_user()
+ oo_cfg.deployment.variables['ansible_ssh_user'] = \
+ get_ansible_ssh_user()
click.clear()
if not oo_cfg.settings.get('variant', ''):