Merge pull request #1487 from brenton/master

a-o-i: Better method for identifying master_lb

.tito/packages/openshift-ansible

@@ -1 +1 @@
-3.0.46-1 ./
+3.0.47-1 ./

openshift-ansible.spec

@@ -5,7 +5,7 @@
 }
 
 Name:           openshift-ansible
-Version:        3.0.46
+Version:        3.0.47
 Release:        1%{?dist}
 Summary:        Openshift and Atomic Enterprise Ansible
 License:        ASL 2.0
@@ -261,6 +261,10 @@ Atomic OpenShift Utilities includes
 
 
 %changelog
+* Wed Feb 24 2016 Brenton Leanhardt <bleanhar@redhat.com> 3.0.47-1
+- a-o-i: Double safety check on master_lb (smunilla@redhat.com)
+- a-o-i: Better method for identifying master_lb (smunilla@redhat.com)
+
 * Tue Feb 23 2016 Brenton Leanhardt <bleanhar@redhat.com> 3.0.46-1
 - a-o-i: Exception checking around master_lb (smunilla@redhat.com)
 

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):