http://gitlab.cloudforms.lab.eng.rdu2.redhat.com/cloudforms/cfme/merge_requests/268
New commit detected on cfme/5.4.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=da6ae33b472e49d006ac89d83bbb6da97b1c1a8d commit da6ae33b472e49d006ac89d83bbb6da97b1c1a8d Merge: 34e1cc4 0086b8c Author: Gregg Tanzillo <gtanzill> AuthorDate: Mon Sep 28 15:04:36 2015 -0400 Commit: Gregg Tanzillo <gtanzill> CommitDate: Mon Sep 28 15:04:36 2015 -0400 Merge branch 'bz1257734-handle-missing-services-better' into '5.4.z' Handle missing services better Administrators can configure OpenStack tenants and users in such a way that restricts access to certain services on certain tenants. The `OpenstackHandle#detect_service` method handled this by returning `nil` when it could not connect to the appropriate service. However, several callers were not handling the `nil` response properly. Now, at least callers to `OpenstackHandle#service_for_each_accessible_tenant` will only have their block called when the requested service is actually available for the tenant. Otherwise, a warning will be logged, and that iteration of the `service_for_each_accessible_tenant` will be skipped. Upstream PR: https://github.com/ManageIQ/manageiq/pull/4088 Clean merge with: git am --directory=lib -p3 0001-OpenStack-Handle-missing-services-better.patch https://bugzilla.redhat.com/show_bug.cgi?id=1245511 https://bugzilla.redhat.com/show_bug.cgi?id=1257734 See merge request !268 lib/openstack/openstack_handle/handle.rb | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
New commit detected on cfme/5.4.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=0086b8c10c0276642adb48e596ad61452d3e764b commit 0086b8c10c0276642adb48e596ad61452d3e764b Author: Greg Blomquist <gblomqui> AuthorDate: Thu Aug 27 15:55:53 2015 -0400 Commit: Greg Blomquist <gblomqui> CommitDate: Mon Sep 28 09:56:43 2015 -0400 Handle missing services better Administrators can configure OpenStack tenants and users in such a way that restricts access to certain services on certain tenants. The `OpenstackHandle#detect_service` method handled this by returning `nil` when it could not connect to the appropriate service. However, several callers were not handling the `nil` response properly. Now, at least callers to `OpenstackHandle#service_for_each_accessible_tenant` will only have their block called when the requested service is actually available for the tenant. Otherwise, a warning will be logged, and that iteration of the `service_for_each_accessible_tenant` will be skipped. https://bugzilla.redhat.com/show_bug.cgi?id=1245511 https://bugzilla.redhat.com/show_bug.cgi?id=1257734 lib/openstack/openstack_handle/handle.rb | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
*** Bug 1267341 has been marked as a duplicate of this bug. ***
Good to go. Verified in 5.4.3.0.20151001120745_d11cf59
Since the problem described in this bug report should be resolved in a recent advisory, it has been closed with a resolution of ERRATA. For information on the advisory, and where to find the updated files, follow the link below. If the solution does not work for you, open a new bug report. https://rhn.redhat.com/errata/RHBA-2015-1916.html