summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-15 13:02:15 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-15 13:02:15 -0500
commitabba5eeb468a994caca5194eaf217e7527262613 (patch)
treecedb36754019107e66e7c48fd00dd57e78f2120e
parent6a84510d137bd022d515ba480e7daba4172f520e (diff)
parentd135ccbbdd2f055a25ff168c6b140add0e8f5d73 (diff)
downloadopenshift-abba5eeb468a994caca5194eaf217e7527262613.tar.gz
openshift-abba5eeb468a994caca5194eaf217e7527262613.tar.bz2
openshift-abba5eeb468a994caca5194eaf217e7527262613.tar.xz
openshift-abba5eeb468a994caca5194eaf217e7527262613.zip
Merge pull request #1399 from smunilla/BZ1308440
a-o-i: Count nativeha hosts as "installed" for scaleup
-rw-r--r--utils/src/ooinstall/cli_installer.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index e1047e700..9839bf447 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -526,10 +526,14 @@ Add new nodes here
def get_installed_hosts(hosts, callback_facts):
installed_hosts = []
for host in hosts:
- if(host.connect_to in callback_facts.keys()
- and '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'):
+ if host.connect_to in callback_facts.keys() and (
+ ('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') \
+ or
+ ('master' in callback_facts[host.connect_to].keys() and
+ callback_facts[host.connect_to]['master'].get('cluster_method', '') == 'native')
+ ):
installed_hosts.append(host)
return installed_hosts