Merge "Rename bad option value"
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 05a8d95..90b7d44 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -28,8 +28,10 @@
local.conf
==========
-The new configuration file is ``local.conf`` and resides in the root
-DevStack directory like the old ``localrc`` file. It is a modified INI
+The new configuration file is ``local.conf`` and should reside in the
+root Devstack directory. An example of such ``local.conf`` file
+is provided in the ``devstack/samples`` directory. Copy this file into
+the root Devstack directory and adapt it to your needs. It is a modified INI
format file that introduces a meta-section header to carry additional
information regarding the configuration files to be changed.
diff --git a/functions-common b/functions-common
index 60cf04c..641eca8 100644
--- a/functions-common
+++ b/functions-common
@@ -852,13 +852,18 @@
# Usage: _get_or_create_endpoint_with_interface <service> <interface> <url> <region>
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 \
--os-url $KEYSTONE_SERVICE_URI_V3 \
--os-identity-api-version=3 \
--service $1 \
--interface $2 \
--region $4 \
- -c ID -f value)
+ -c ID -c Region -f value | grep $4 | cut -f 1 -d " ")
if [[ -z "$endpoint_id" ]]; then
# Creates new endpoint
endpoint_id=$(openstack endpoint create \