From 5cc71c364963c52eb73b89a7599e422ff42b959f Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Tue, 23 Feb 2016 08:48:00 -0500 Subject: a-o-i: Exception checking around master_lb Some additional error checking when selecting the master_lb --- utils/src/ooinstall/cli_installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index f09f90288..7a97de4e6 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/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 -- cgit v1.2.3 From fdc252fac0210baa7328918ff9fd6af42ee79925 Mon Sep 17 00:00:00 2001 From: Brenton Leanhardt Date: Tue, 23 Feb 2016 11:47:47 -0500 Subject: Automatic commit of package [openshift-ansible] release [3.0.46-1]. --- .tito/packages/openshift-ansible | 2 +- openshift-ansible.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index 722fad28d..4b283f29f 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.0.45-1 ./ +3.0.46-1 ./ diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 4eef29a4d..a9ac557a5 100644 --- a/openshift-ansible.spec +++ b/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 3.0.46-1 +- a-o-i: Exception checking around master_lb (smunilla@redhat.com) + * Mon Feb 22 2016 Brenton Leanhardt 3.0.45-1 - Do not monitor for etcd watchers (mmahut@redhat.com) - remove old master registry item/triggers (jdiaz@redhat.com) -- cgit v1.2.3