From c14636c61fcc4d4682db1a0328628c6743de2f95 Mon Sep 17 00:00:00 2001
From: "Dave Walker (Daviey)" <email@daviey.com>
Date: Wed, 10 Aug 2016 14:28:38 +0100
Subject: [PATCH] Add --user-domain when adding heat role admin

The --user-domain parameter is required when adding the role for
Heat.  Without it, the command fails and the bootstrap
container exits early with the error message:

"No user with a name or ID of 'heat_domain_admin' exists."

Change-Id: I6f813edde3f437bca3ef521a43454146082bc5f5
Closes-bug: #1611768
Signed-off-by: Dave Walker (Daviey) <email@daviey.com>
---
 docker/heat/heat-api/extend_start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/heat/heat-api/extend_start.sh b/docker/heat/heat-api/extend_start.sh
index 5702922e86..59c7a3ab77 100644
--- a/docker/heat/heat-api/extend_start.sh
+++ b/docker/heat/heat-api/extend_start.sh
@@ -9,7 +9,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     if [[ "heat_user_domain" != "$CURRENT_HEAT_DOMAIN_NAME" ]]; then
         openstack domain create heat_user_domain
         openstack user create --domain heat_user_domain heat_domain_admin --password ${HEAT_DOMAIN_ADMIN_PASSWORD}
-        openstack role add --domain heat_user_domain --user heat_domain_admin admin
+        openstack role add --domain heat_user_domain --user-domain heat_user_domain --user heat_domain_admin admin
         openstack role create heat_stack_owner
         openstack role create heat_stack_user
     fi