diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-02-15 12:00:48 -0500 |
|---|---|---|
| committer | Samuel Munilla <smunilla@redhat.com> | 2016-02-15 12:04:08 -0500 |
| commit | d135ccbbdd2f055a25ff168c6b140add0e8f5d73 (patch) | |
| tree | b4a74198a1ebb371c952e8782a306666276d452a /utils/src | |
| parent | ce306085ee0b8667dbba90e3a95199ce066c38d4 (diff) | |
| download | openshift-d135ccbbdd2f055a25ff168c6b140add0e8f5d73.tar.gz openshift-d135ccbbdd2f055a25ff168c6b140add0e8f5d73.tar.bz2 openshift-d135ccbbdd2f055a25ff168c6b140add0e8f5d73.tar.xz openshift-d135ccbbdd2f055a25ff168c6b140add0e8f5d73.zip | |
a-o-i: Count nativeha hosts as "installed" for scaleup
Diffstat (limited to 'utils/src')
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 12 |
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 |