commit a6742bb0f983664919b91582f56a57bfbcbf8dd0
author Jenkins <jenkins@review.openstack.org> Thu Jan 05 16:28:58 2017 +0000
committer Gerrit Code Review <review@openstack.org> Thu Jan 05 16:28:58 2017 +0000
tree 2930da0a00f2cd0752ceac01736fa58f516cc076
parent 9c7bbca414c1eacc2e188acffae2f10a3cafacb3
parent 80b1d0ae7db263dada7fdc4d9d8190d0518b8f6c

Merge "Fix placement service for identity-v3"

lib/placement

diff --git a/lib/placement b/lib/placement
index 93b72eb..871e282 100644
--- a/lib/placement
+++ b/lib/placement
@@ -103,9 +103,9 @@
     iniset $NOVA_CONF placement auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3"
     iniset $NOVA_CONF placement username placement
     iniset $NOVA_CONF placement password "$SERVICE_PASSWORD"
-    iniset $NOVA_CONF placement user_domain_name "Default"
+    iniset $NOVA_CONF placement user_domain_name "$SERVICE_DOMAIN_NAME"
     iniset $NOVA_CONF placement project_name "$SERVICE_TENANT_NAME"
-    iniset $NOVA_CONF placement project_domain_name "Default"
+    iniset $NOVA_CONF placement project_domain_name "$SERVICE_DOMAIN_NAME"
     iniset $NOVA_CONF placement os_region_name "$REGION_NAME"
     # TODO(cdent): auth_strategy, which is common to see in these
     # blocks is not currently used here. For the time being the