openstack/kolla
Code Issues Proposed changes

Merge "Change heat domain to heat_user_domain"

Browse Source
This commit is contained in:
Jenkins 2016-03-25 04:10:46 +00:00 committed by Gerrit Code Review
commit b1030263c5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/heat/heat-api/extend_start.sh
View File

@ -7,9 +7,9 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
CURRENT_HEAT_DOMAIN_NAME=$(openstack domain list | grep heat | awk '{print $4}') CURRENT_HEAT_DOMAIN_NAME=$(openstack domain list | grep heat | awk '{print $4}')
if [[ "heat" != "$CURRENT_HEAT_DOMAIN_NAME" ]]; then if [[ "heat" != "$CURRENT_HEAT_DOMAIN_NAME" ]]; then
openstack domain create heat openstack domain create heat_user_domain
openstack user create --domain heat heat_domain_admin --password ${HEAT_DOMAIN_ADMIN_PASSWORD} openstack user create --domain heat_user_domain heat_domain_admin --password ${HEAT_DOMAIN_ADMIN_PASSWORD}
openstack role add --domain heat --user heat_domain_admin admin openstack role add --domain heat_user_domain --user heat_domain_admin admin
openstack role create heat_stack_owner openstack role create heat_stack_owner
openstack role create heat_stack_user openstack role create heat_stack_user
fi fi