diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-02-24 12:58:13 -0500 |
|---|---|---|
| committer | Samuel Munilla <smunilla@redhat.com> | 2016-02-24 13:18:16 -0500 |
| commit | 2fa19cdba71289c7e2006c992e55606c0147ebd6 (patch) | |
| tree | bccf99ef383c89f72575de91b8cec6bf7a3de710 /utils | |
| parent | 4c84eebddaea08be5dcb89b1a27bb9c886a0a321 (diff) | |
| download | openshift-2fa19cdba71289c7e2006c992e55606c0147ebd6.tar.gz openshift-2fa19cdba71289c7e2006c992e55606c0147ebd6.tar.bz2 openshift-2fa19cdba71289c7e2006c992e55606c0147ebd6.tar.xz openshift-2fa19cdba71289c7e2006c992e55606c0147ebd6.zip | |
a-o-i: Double safety check on master_lb
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 07429de09..ace834323 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -540,17 +540,18 @@ def get_installed_hosts(hosts, callback_facts): except (KeyError, StopIteration): pass - for host in hosts: if host.connect_to in callback_facts.keys() and is_installed_host(host, callback_facts): installed_hosts.append(host) return installed_hosts def is_installed_host(host, callback_facts): - return 'common' in callback_facts[host.connect_to].keys() and \ + version_found = 'common' in callback_facts[host.connect_to].keys() and \ callback_facts[host.connect_to]['common'].get('version', '') and \ callback_facts[host.connect_to]['common'].get('version', '') != 'None' + return version_found or host.master_lb or host.preconfigured + # pylint: disable=too-many-branches # This pylint error will be corrected shortly in separate PR. def get_hosts_to_run_on(oo_cfg, callback_facts, unattended, force, verbose): |