summaryrefslogtreecommitdiffstats
path: root/utils/test/fixture.py
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-09 09:30:24 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-09 09:30:24 -0500
commitc9301aa9682846a35dac6948cc0efb5d4628a3ad (patch)
tree8de46887206d3cc596c6b562c5c7f762ad924a53 /utils/test/fixture.py
parent72fbab29392f7b4697a440f406d6873941086d7d (diff)
parentbcbb870431bea53a9863802e15bbfad98931b04d (diff)
downloadopenshift-c9301aa9682846a35dac6948cc0efb5d4628a3ad.tar.gz
openshift-c9301aa9682846a35dac6948cc0efb5d4628a3ad.tar.bz2
openshift-c9301aa9682846a35dac6948cc0efb5d4628a3ad.tar.xz
openshift-c9301aa9682846a35dac6948cc0efb5d4628a3ad.zip
Merge pull request #1009 from smunilla/nfs_question
Questions for NFS Storage Registry
Diffstat (limited to 'utils/test/fixture.py')
-rw-r--r--utils/test/fixture.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/utils/test/fixture.py b/utils/test/fixture.py
index 1b1c2e5c2..d6222dfaa 100644
--- a/utils/test/fixture.py
+++ b/utils/test/fixture.py
@@ -92,7 +92,7 @@ class OOCliFixture(OOInstallFixture):
self.assertTrue('hostname' in host)
self.assertTrue('public_hostname' in host)
if 'preconfigured' not in host:
- self.assertTrue(host['node'])
+ self.assertTrue('node' in host or 'storage' in host)
self.assertTrue('ip' in host)
self.assertTrue('public_ip' in host)
@@ -142,7 +142,7 @@ class OOCliFixture(OOInstallFixture):
#pylint: disable=too-many-arguments,too-many-branches,too-many-statements
def build_input(ssh_user=None, hosts=None, variant_num=None,
add_nodes=None, confirm_facts=None, schedulable_masters_ok=None,
- master_lb=None):
+ master_lb=None, storage=None):
"""
Build an input string simulating a user entering values in an interactive
attended install.
@@ -197,7 +197,10 @@ def build_input(ssh_user=None, hosts=None, variant_num=None,
inputs.append(master_lb[0])
inputs.append('y' if master_lb[1] else 'n')
- inputs.append('example.com')
+ if storage:
+ inputs.append(storage)
+
+ inputs.append('subdomain.example.com')
# TODO: support option 2, fresh install
if add_nodes: