summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-08 11:27:34 -0500
committerGitHub <noreply@github.com>2016-11-08 11:27:34 -0500
commitbe5fbab1e3c11458f7ec979346e627923f3efe79 (patch)
treee53d19f3f396fa9ad7efb230b72abf3b7ef73de8
parent399d4b93cbff1ad98d332ae05302455d0b3c98e1 (diff)
parent031cd4b9807b2a1be7a0fc7340744f0a7a2d482d (diff)
downloadopenshift-be5fbab1e3c11458f7ec979346e627923f3efe79.tar.gz
openshift-be5fbab1e3c11458f7ec979346e627923f3efe79.tar.bz2
openshift-be5fbab1e3c11458f7ec979346e627923f3efe79.tar.xz
openshift-be5fbab1e3c11458f7ec979346e627923f3efe79.zip
Merge pull request #2729 from tbielawa/BZ1390064
Bug 1390064 - [quick install] a complete installed cluster was reported as a mix of installed and uninstalled env
-rw-r--r--utils/src/ooinstall/cli_installer.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 286e50f64..8470fb527 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -739,17 +739,17 @@ def get_hosts_to_run_on(oo_cfg, callback_facts, unattended, force):
installed_hosts, uninstalled_hosts = get_installed_hosts(oo_cfg.deployment.hosts,
callback_facts)
nodes = [host for host in oo_cfg.deployment.hosts if host.is_node()]
- not_balancers = [host for host in oo_cfg.deployment.hosts if not host.is_master_lb()]
+ masters_and_nodes = [host for host in oo_cfg.deployment.hosts if host.is_master() or host.is_node()]
in_hosts = [str(h) for h in installed_hosts]
un_hosts = [str(h) for h in uninstalled_hosts]
all_hosts = [str(h) for h in oo_cfg.deployment.hosts]
- no_bals = [str(h) for h in not_balancers]
+ m_and_n = [str(h) for h in masters_and_nodes]
INSTALLER_LOG.debug("installed hosts: %s", ", ".join(in_hosts))
INSTALLER_LOG.debug("uninstalled hosts: %s", ", ".join(un_hosts))
INSTALLER_LOG.debug("deployment hosts: %s", ", ".join(all_hosts))
- INSTALLER_LOG.debug("not balancers: %s", ", ".join(no_bals))
+ INSTALLER_LOG.debug("masters and nodes: %s", ", ".join(m_and_n))
# Case (1): All uninstalled hosts
if len(uninstalled_hosts) == len(nodes):
@@ -757,7 +757,7 @@ def get_hosts_to_run_on(oo_cfg, callback_facts, unattended, force):
hosts_to_run_on = list(oo_cfg.deployment.hosts)
else:
# Case (2): All installed hosts
- if len(installed_hosts) == len(not_balancers):
+ if len(installed_hosts) == len(masters_and_nodes):
message = """
All specified hosts in specified environment are installed.
"""