summaryrefslogtreecommitdiffstats
path: root/utils/test
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2015-11-20 15:34:35 -0500
committerSamuel Munilla <smunilla@redhat.com>2015-11-20 15:40:11 -0500
commit27a8228a81c81b2f7db003eedb3b9eaf03a849b4 (patch)
tree27ed5fab66c397cdae2adf33f80f5ae2ddf0e537 /utils/test
parent20f9d2c0d0387ffda27213b8f05f0e884fdd16ac (diff)
downloadopenshift-27a8228a81c81b2f7db003eedb3b9eaf03a849b4.tar.gz
openshift-27a8228a81c81b2f7db003eedb3b9eaf03a849b4.tar.bz2
openshift-27a8228a81c81b2f7db003eedb3b9eaf03a849b4.tar.xz
openshift-27a8228a81c81b2f7db003eedb3b9eaf03a849b4.zip
atomic-openshift-installer: Reverse version and host collection
Reverse the order we ask two questions: What variant the user wants to install and which hosts to install on. This lets us avoid asking for multiple masters for 3.0 installs.
Diffstat (limited to 'utils/test')
-rw-r--r--utils/test/cli_installer_tests.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/test/cli_installer_tests.py b/utils/test/cli_installer_tests.py
index 87aafe782..9cb44404c 100644
--- a/utils/test/cli_installer_tests.py
+++ b/utils/test/cli_installer_tests.py
@@ -628,6 +628,9 @@ class AttendedCliTests(OOCliFixture):
if ssh_user:
inputs.append(ssh_user)
+ if variant_num:
+ inputs.append(str(variant_num)) # Choose variant + version
+
if hosts:
i = 0
for (host, is_master) in hosts:
@@ -640,9 +643,6 @@ class AttendedCliTests(OOCliFixture):
inputs.append('n') # Done adding hosts
i += 1
- if variant_num:
- inputs.append(str(variant_num)) # Choose variant + version
-
# TODO: support option 2, fresh install
if add_nodes:
inputs.append('1') # Add more nodes