diff options
author | Samuel Munilla <smunilla@redhat.com> | 2016-03-09 08:45:09 -0500 |
---|---|---|
committer | Samuel Munilla <smunilla@redhat.com> | 2016-03-09 09:09:24 -0500 |
commit | bcbb870431bea53a9863802e15bbfad98931b04d (patch) | |
tree | 8de46887206d3cc596c6b562c5c7f762ad924a53 /utils/src | |
parent | 2ce2f905275acd7ec4cda7fa072ba385208f30d1 (diff) | |
download | openshift-bcbb870431bea53a9863802e15bbfad98931b04d.tar.gz openshift-bcbb870431bea53a9863802e15bbfad98931b04d.tar.bz2 openshift-bcbb870431bea53a9863802e15bbfad98931b04d.tar.xz openshift-bcbb870431bea53a9863802e15bbfad98931b04d.zip |
a-o-i: Fix NFS storage tests
Fix the nosetests after the rebase
Diffstat (limited to 'utils/src')
-rw-r--r-- | utils/src/ooinstall/cli_installer.py | 16 | ||||
-rw-r--r-- | utils/src/ooinstall/oo_config.py | 3 |
2 files changed, 13 insertions, 6 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 465b2e6d2..c53ca7b18 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -248,6 +248,8 @@ def print_host_summary(all_hosts, host): click.echo(" - Etcd Member") else: click.echo(" - Etcd (Embedded)") + if host.storage: + click.echo(" - Storage") def collect_master_lb(hosts): @@ -372,11 +374,15 @@ Notes: for h in hosts: if h.preconfigured == True: continue - default_facts[h.connect_to] = {} - h.ip = callback_facts[h.connect_to]["common"]["ip"] - h.public_ip = callback_facts[h.connect_to]["common"]["public_ip"] - h.hostname = callback_facts[h.connect_to]["common"]["hostname"] - h.public_hostname = callback_facts[h.connect_to]["common"]["public_hostname"] + try: + default_facts[h.connect_to] = {} + h.ip = callback_facts[h.connect_to]["common"]["ip"] + h.public_ip = callback_facts[h.connect_to]["common"]["public_ip"] + h.hostname = callback_facts[h.connect_to]["common"]["hostname"] + h.public_hostname = callback_facts[h.connect_to]["common"]["public_hostname"] + except KeyError: + click.echo("Problem fetching facts from {}".format(h.connect_to)) + continue default_facts_lines.append(",".join([h.connect_to, h.ip, diff --git a/utils/src/ooinstall/oo_config.py b/utils/src/ooinstall/oo_config.py index 8e3a11240..c9498542f 100644 --- a/utils/src/ooinstall/oo_config.py +++ b/utils/src/ooinstall/oo_config.py @@ -59,7 +59,8 @@ class Host(object): raise OOConfigInvalidHostError("You must specify either an ip " \ "or hostname as 'connect_to'") - if self.master is False and self.node is False and self.master_lb is False: + if self.master is False and self.node is False and \ + self.master_lb is False and self.storage is False: raise OOConfigInvalidHostError( "You must specify each host as either a master or a node.") |