Browse Source

Merge pull request #1480 from brenton/master

a-o-i: Exception checking around master_lb
Brenton Leanhardt 9 years ago
parent
commit
09de9a9970

+ 1 - 1
.tito/packages/openshift-ansible

@@ -1 +1 @@
-3.0.45-1 ./
+3.0.46-1 ./

+ 4 - 1
openshift-ansible.spec

@@ -5,7 +5,7 @@
 }
 
 Name:           openshift-ansible
-Version:        3.0.45
+Version:        3.0.46
 Release:        1%{?dist}
 Summary:        Openshift and Atomic Enterprise Ansible
 License:        ASL 2.0
@@ -261,6 +261,9 @@ Atomic OpenShift Utilities includes
 
 
 %changelog
+* Tue Feb 23 2016 Brenton Leanhardt <bleanhar@redhat.com> 3.0.46-1
+- a-o-i: Exception checking around master_lb (smunilla@redhat.com)
+
 * Mon Feb 22 2016 Brenton Leanhardt <bleanhar@redhat.com> 3.0.45-1
 - Do not monitor for etcd watchers (mmahut@redhat.com)
 - remove old master registry item/triggers (jdiaz@redhat.com)

+ 1 - 1
utils/src/ooinstall/cli_installer.py

@@ -535,7 +535,7 @@ def get_installed_hosts(hosts, callback_facts):
         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)
         installed_hosts.append(lb_host)
-    except KeyError:
+    except (KeyError, StopIteration):
         pass