openstack/devstack
Code Issues Proposed changes

Merge "Fix DevStack failure in multi-region setting"

Browse Source
This commit is contained in:
Jenkins 2016-04-20 20:42:24 +00:00 committed by Gerrit Code Review
commit 878c2b98e6
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/source/configuration.rst
View File

@ -742,6 +742,16 @@ In RegionTwo:
KEYSTONE_SERVICE_HOST=<KEYSTONE_IP_ADDRESS_FROM_REGION_ONE> KEYSTONE_SERVICE_HOST=<KEYSTONE_IP_ADDRESS_FROM_REGION_ONE>
KEYSTONE_AUTH_HOST=<KEYSTONE_IP_ADDRESS_FROM_REGION_ONE> KEYSTONE_AUTH_HOST=<KEYSTONE_IP_ADDRESS_FROM_REGION_ONE>
REGION_NAME=RegionTwo REGION_NAME=RegionTwo
KEYSTONE_REGION_NAME=RegionOne
In the devstack for RegionOne, we set REGION_NAME as RegionOne, so region of
the services started in this devstack are registered as RegionOne. In devstack
for RegionTwo, similarly, we set REGION_NAME as RegionTwo since we want
services started in this devstack to be registered in RegionTwo. But Keystone
service is started and registered in RegionOne, not RegionTwo, so we use
KEYSTONE_REGION_NAME to specify the region of Keystone service.
KEYSTONE_REGION_NAME has a default value the same as REGION_NAME thus we omit
it in the configuration of RegionOne.
Disabling Identity API v2 Disabling Identity API v2
+++++++++++++++++++++++++ +++++++++++++++++++++++++

2
stack.sh
View File

@ -1020,7 +1020,7 @@ export OS_USER_DOMAIN_ID=default
export OS_PASSWORD=$ADMIN_PASSWORD export OS_PASSWORD=$ADMIN_PASSWORD
export OS_PROJECT_NAME=admin export OS_PROJECT_NAME=admin
export OS_PROJECT_DOMAIN_ID=default export OS_PROJECT_DOMAIN_ID=default
export OS_REGION_NAME=$REGION_NAME export OS_REGION_NAME=$KEYSTONE_REGION_NAME
EOF EOF

6
stackrc
View File

@ -42,6 +42,12 @@ fi
# Specify region name Region # Specify region name Region
REGION_NAME=${REGION_NAME:-RegionOne} REGION_NAME=${REGION_NAME:-RegionOne}
# Specify name of region where identity service endpoint is registered.
# When deploying multiple DevStack instances in different regions with shared
# Keystone, set KEYSTONE_REGION_NAME to the region where Keystone is running
# for DevStack instances which do not host Keystone.
KEYSTONE_REGION_NAME=${KEYSTONE_REGION_NAME:-$REGION_NAME}
# Specify which services to launch. These generally correspond to # Specify which services to launch. These generally correspond to
# screen tabs. To change the default list, use the ``enable_service`` and # screen tabs. To change the default list, use the ``enable_service`` and
# ``disable_service`` functions in ``local.conf``. # ``disable_service`` functions in ``local.conf``.