Browse code

Merge "Fix DevStack failure in multi-region setting"

Jenkins authored on 2016/04/21 05:42:24
Showing 3 changed files
... ...
@@ -742,6 +742,16 @@ In RegionTwo:
742 742
     KEYSTONE_SERVICE_HOST=<KEYSTONE_IP_ADDRESS_FROM_REGION_ONE>
743 743
     KEYSTONE_AUTH_HOST=<KEYSTONE_IP_ADDRESS_FROM_REGION_ONE>
744 744
     REGION_NAME=RegionTwo
745
+    KEYSTONE_REGION_NAME=RegionOne
746
+
747
+In the devstack for RegionOne, we set REGION_NAME as RegionOne, so region of
748
+the services started in this devstack are registered as RegionOne. In devstack
749
+for RegionTwo, similarly, we set REGION_NAME as RegionTwo since we want
750
+services started in this devstack to be registered in RegionTwo. But Keystone
751
+service is started and registered in RegionOne, not RegionTwo, so we use
752
+KEYSTONE_REGION_NAME to specify the region of Keystone service.
753
+KEYSTONE_REGION_NAME has a default value the same as REGION_NAME thus we omit
754
+it in the configuration of RegionOne.
745 755
 
746 756
 Disabling Identity API v2
747 757
 +++++++++++++++++++++++++
... ...
@@ -1020,7 +1020,7 @@ export OS_USER_DOMAIN_ID=default
1020 1020
 export OS_PASSWORD=$ADMIN_PASSWORD
1021 1021
 export OS_PROJECT_NAME=admin
1022 1022
 export OS_PROJECT_DOMAIN_ID=default
1023
-export OS_REGION_NAME=$REGION_NAME
1023
+export OS_REGION_NAME=$KEYSTONE_REGION_NAME
1024 1024
 
1025 1025
 EOF
1026 1026
 
... ...
@@ -42,6 +42,12 @@ fi
42 42
 # Specify region name Region
43 43
 REGION_NAME=${REGION_NAME:-RegionOne}
44 44
 
45
+# Specify name of region where identity service endpoint is registered.
46
+# When deploying multiple DevStack instances in different regions with shared
47
+# Keystone, set KEYSTONE_REGION_NAME to the region where Keystone is running
48
+# for DevStack instances which do not host Keystone.
49
+KEYSTONE_REGION_NAME=${KEYSTONE_REGION_NAME:-$REGION_NAME}
50
+
45 51
 # Specify which services to launch.  These generally correspond to
46 52
 # screen tabs. To change the default list, use the ``enable_service`` and
47 53
 # ``disable_service`` functions in ``local.conf``.