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-23 18:05:26 -0500
commit16e373e9c71f929e3eaf5d747e1f1ad9057c0184 (patch)
tree476c7da7f9e5c9f45d1e1f9d657de2f2e88c2e5c /utils/test
parent992d147e722795be98bcb1a8b890c66035ab6c49 (diff)
downloadopenshift-16e373e9c71f929e3eaf5d747e1f1ad9057c0184.tar.gz
openshift-16e373e9c71f929e3eaf5d747e1f1ad9057c0184.tar.bz2
openshift-16e373e9c71f929e3eaf5d747e1f1ad9057c0184.tar.xz
openshift-16e373e9c71f929e3eaf5d747e1f1ad9057c0184.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