diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-23 12:06:12 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-23 12:06:12 -0500 |
| commit | 09de9a99702ab3b883ed4ede919194a21aed1db3 (patch) | |
| tree | e18958879638aebe2797056be6882f5a9956855d | |
| parent | 3ee897a78b52519693cd6652feb5bbafcc036895 (diff) | |
| parent | fdc252fac0210baa7328918ff9fd6af42ee79925 (diff) | |
| download | openshift-09de9a99702ab3b883ed4ede919194a21aed1db3.tar.gz openshift-09de9a99702ab3b883ed4ede919194a21aed1db3.tar.bz2 openshift-09de9a99702ab3b883ed4ede919194a21aed1db3.tar.xz openshift-09de9a99702ab3b883ed4ede919194a21aed1db3.zip | |
Merge pull request #1480 from brenton/master
a-o-i: Exception checking around master_lb
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rw-r--r-- | openshift-ansible.spec | 5 | ||||
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 2 |
3 files changed, 6 insertions, 3 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 <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) 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 |