summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2015-11-26 11:55:32 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2015-11-26 11:55:32 -0400
commite6054d0ef7d07f370496dac82975b17dc3dfce70 (patch)
treedcbdbcd540a19157ef17ef4087824cb1dbb9d24d
parent139a82349040983a4af7ebd7e09e32a96bc00667 (diff)
downloadopenshift-e6054d0ef7d07f370496dac82975b17dc3dfce70.tar.gz
openshift-e6054d0ef7d07f370496dac82975b17dc3dfce70.tar.bz2
openshift-e6054d0ef7d07f370496dac82975b17dc3dfce70.tar.xz
openshift-e6054d0ef7d07f370496dac82975b17dc3dfce70.zip
Don't prompt to continue during unattended installs.
-rw-r--r--utils/src/ooinstall/cli_installer.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index a016a5597..acfb5065b 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -263,7 +263,7 @@ Edit %s with the desired values and run `atomic-openshift-installer --unattended
-def check_hosts_config(oo_cfg):
+def check_hosts_config(oo_cfg, unattended):
click.clear()
masters = [host for host in oo_cfg.hosts if host.master]
if len(masters) > 1:
@@ -283,7 +283,8 @@ of your choice to balance the master API (port 8443) on all master hosts.
https://docs.openshift.org/latest/install_config/install/advanced_install.html#multiple-masters
"""
- confirm_continue(message)
+ if not unattended:
+ confirm_continue(message)
nodes = [host for host in oo_cfg.hosts if host.node]
if len(masters) == len(nodes):
@@ -292,7 +293,8 @@ No dedicated Nodes specified. By default, colocated Masters have their Nodes
set to unscheduleable. Continuing at this point will label all nodes as
scheduleable.
"""
- confirm_continue(message)
+ if not unattended:
+ confirm_continue(message)
return
@@ -654,7 +656,7 @@ def install(ctx, force):
else:
oo_cfg = get_missing_info_from_user(oo_cfg)
- check_hosts_config(oo_cfg)
+ check_hosts_config(oo_cfg, ctx.obj['unattended'])
click.echo('Gathering information from hosts...')
callback_facts, error = openshift_ansible.default_facts(oo_cfg.hosts,