From d135ccbbdd2f055a25ff168c6b140add0e8f5d73 Mon Sep 17 00:00:00 2001
From: Samuel Munilla <smunilla@redhat.com>
Date: Mon, 15 Feb 2016 12:00:48 -0500
Subject: a-o-i: Count nativeha hosts as "installed" for scaleup
---
utils/src/ooinstall/cli_installer.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
(limited to 'utils')
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
--
cgit v1.2.3