Browse code

Merge "Fix placement service for identity-v3"

Jenkins authored on 2017/01/06 01:28:58
Showing 1 changed files
... ...
@@ -103,9 +103,9 @@ function configure_placement_nova_compute {
103 103
     iniset $NOVA_CONF placement auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3"
104 104
     iniset $NOVA_CONF placement username placement
105 105
     iniset $NOVA_CONF placement password "$SERVICE_PASSWORD"
106
-    iniset $NOVA_CONF placement user_domain_name "Default"
106
+    iniset $NOVA_CONF placement user_domain_name "$SERVICE_DOMAIN_NAME"
107 107
     iniset $NOVA_CONF placement project_name "$SERVICE_TENANT_NAME"
108
-    iniset $NOVA_CONF placement project_domain_name "Default"
108
+    iniset $NOVA_CONF placement project_domain_name "$SERVICE_DOMAIN_NAME"
109 109
     iniset $NOVA_CONF placement os_region_name "$REGION_NAME"
110 110
     # TODO(cdent): auth_strategy, which is common to see in these
111 111
     # blocks is not currently used here. For the time being the