openstack/devstack
Code Issues Proposed changes

Merge "Remove multi-region workaround"

Browse Source
This commit is contained in:
Jenkins 2015-11-16 05:15:49 +00:00 committed by Gerrit Code Review
commit 3bc6f042e4
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
functions-common
View File

@ -910,16 +910,11 @@ function get_or_create_service {
# Usage: _get_or_create_endpoint_with_interface <service> <interface> <url> <region> # Usage: _get_or_create_endpoint_with_interface <service> <interface> <url> <region>
function _get_or_create_endpoint_with_interface { function _get_or_create_endpoint_with_interface {
local endpoint_id 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 \ endpoint_id=$(openstack endpoint list \
--service $1 \ --service $1 \
--interface $2 \ --interface $2 \
--region $4 \ --region $4 \
-c ID -c Region -f value | grep $4 | cut -f 1 -d " ") -c ID -f value)
if [[ -z "$endpoint_id" ]]; then if [[ -z "$endpoint_id" ]]; then
# Creates new endpoint # Creates new endpoint
endpoint_id=$(openstack endpoint create \ endpoint_id=$(openstack endpoint create \