From 0ec80802735163fdbdb4ceaa339aa73f93bbd87a Mon Sep 17 00:00:00 2001 From: Daniel Gonzalez Date: Fri, 30 Oct 2015 14:25:41 +0100 Subject: [PATCH] Remove multi-region workaround When keystone API v3 was introduced, filtering regions when listing endpoints was not supported (see [1]). This caused multi-region devstack deployments to fail (see [2]). A workaround was introduced to devstack to enable for multi-region deployments until region filtering would work in keystone API v3. Now that the bug related to region filtering in keystone is resolved, the workaround should be removed. [1]: https://bugs.launchpad.net/keystone/+bug/1482772 [2]: https://bugs.launchpad.net/devstack/+bug/1483784 Closes-Bug: #1511745 Related-Bug: #1483784 Related-Bug: #1482772 Change-Id: I52d13c3f5e7b77a7f8fb1be4dcea437988ebddfe --- functions-common | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/functions-common b/functions-common index d36d323820..d282203d45 100644 --- a/functions-common +++ b/functions-common @@ -913,16 +913,11 @@ function get_or_create_service { # Usage: _get_or_create_endpoint_with_interface function _get_or_create_endpoint_with_interface { local endpoint_id - # TODO(dgonzalez): The check of the region name, as done in the grep - # statement below, exists only because keystone does currently - # not allow filtering the region name when listing endpoints. If keystone - # gets support for this, the check for the region name can be removed. - # Related bug in keystone: https://bugs.launchpad.net/keystone/+bug/1482772 endpoint_id=$(openstack endpoint list \ --service $1 \ --interface $2 \ --region $4 \ - -c ID -c Region -f value | grep $4 | cut -f 1 -d " ") + -c ID -f value) if [[ -z "$endpoint_id" ]]; then # Creates new endpoint endpoint_id=$(openstack endpoint create \