summaryrefslogtreecommitdiffstats
path: root/utils/src
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-24 14:01:58 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-24 14:01:58 -0500
commitac8aec58dcf61fee5805168bac8715cde4590142 (patch)
tree8435aea72f00ae262246ced3fdf0c40a6cf98c5b /utils/src
parentb9d2dd909dcbe06a69b61d9dc8a191b5abbf965a (diff)
parent4498ce37b10399b495bb3e6e907d369a33323b07 (diff)
downloadopenshift-ac8aec58dcf61fee5805168bac8715cde4590142.tar.gz
openshift-ac8aec58dcf61fee5805168bac8715cde4590142.tar.bz2
openshift-ac8aec58dcf61fee5805168bac8715cde4590142.tar.xz
openshift-ac8aec58dcf61fee5805168bac8715cde4590142.zip
Merge pull request #1487 from brenton/master
a-o-i: Better method for identifying master_lb
Diffstat (limited to 'utils/src')
-rw-r--r--utils/src/ooinstall/cli_installer.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 7a97de4e6..ace834323 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -533,22 +533,25 @@ def get_installed_hosts(hosts, callback_facts):
try:
first_master = next(host for host in hosts if host.master)
lb_hostname = callback_facts[first_master.connect_to]['master'].get('cluster_hostname', '')
- lb_host = next(host for host in hosts if host.connect_to == lb_hostname)
+ lb_host = \
+ next(host for host in hosts if host.ip == callback_facts[lb_hostname]['common']['ip'])
+
installed_hosts.append(lb_host)
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):