da137ac70d
There are serveral issues with default settings of [trustee] section in heat.conf: 1. Keystone trust isn't added for admin user (heat-trust should be admin's user trustee to make it possible for admin to create stacks). 2. Keystone is adding role "admin" in domain "heat". This blocks creation of correct trust in Keystone as role names are duplicated. Please note that adding this role is not necessary for Heat to work correctly. This commit solves the issues by: 1. Creating a job that will add a Keystone trust between admin and heat-trust users. This allows admin to create Heat stacks. 2. Removes adding a new role in a domain in _ks-domain-user.sh.tpl script. Additionally, as _ks-domain-user.sh.tpl is only really used by Heat chart, this commit also removes it from configmap-bin in Barbican, Magnum, Mistral and Senlin charts. Those charts must have been copy-pasted from Heat chart and don't need to include this file. Also I fix a bug introduced by I86a21e625afd822379ac11351603b2c606a3769f that renamded heat-domain user to heat-trust and created two users with the same name. Change-Id: I303d9bc2aa1796f21bedc6ecdc85a4b3f6c68504 Closes-Bug: 1696462
75 lines
2.6 KiB
Smarty
75 lines
2.6 KiB
Smarty
{{/*
|
|
Copyright 2017 The Openstack-Helm Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/}}
|
|
|
|
{{- define "helm-toolkit.scripts.keystone_domain_user" }}
|
|
#!/bin/bash
|
|
|
|
# Copyright 2017 Pete Birley
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
set -ex
|
|
|
|
# Manage domain
|
|
SERVICE_OS_DOMAIN_ID=$(openstack domain create --or-show --enable -f value -c id \
|
|
--description="Service Domain for ${SERVICE_OS_REGION_NAME}/${SERVICE_OS_DOMAIN_NAME}" \
|
|
"${SERVICE_OS_DOMAIN_NAME}")
|
|
|
|
# Display domain
|
|
openstack domain show "${SERVICE_OS_DOMAIN_ID}"
|
|
|
|
# Manage user
|
|
SERVICE_OS_USERID=$(openstack user create --or-show --enable -f value -c id \
|
|
--domain="${SERVICE_OS_DOMAIN_ID}" \
|
|
--description "Service User for ${SERVICE_OS_REGION_NAME}/${SERVICE_OS_DOMAIN_NAME}" \
|
|
--password="${SERVICE_OS_PASSWORD}" \
|
|
"${SERVICE_OS_USERNAME}")
|
|
|
|
# Manage user password (we do this to ensure the password is updated if required)
|
|
openstack user set --password="${SERVICE_OS_PASSWORD}" "${SERVICE_OS_USERID}"
|
|
|
|
# Display user
|
|
openstack user show "${SERVICE_OS_USERID}"
|
|
|
|
# Manage role
|
|
SERVICE_OS_ROLE_ID=$(openstack role show -f value -c id \
|
|
"${SERVICE_OS_ROLE}" || openstack role create -f value -c id \
|
|
"${SERVICE_OS_ROLE}" )
|
|
|
|
# Manage user role assignment
|
|
openstack role add \
|
|
--domain="${SERVICE_OS_DOMAIN_ID}" \
|
|
--user="${SERVICE_OS_USERID}" \
|
|
--user-domain="${SERVICE_OS_DOMAIN_ID}" \
|
|
"${SERVICE_OS_ROLE_ID}"
|
|
|
|
# Display user role assignment
|
|
openstack role assignment list \
|
|
--role="${SERVICE_OS_ROLE_ID}" \
|
|
--user-domain="${SERVICE_OS_DOMAIN_ID}" \
|
|
--user="${SERVICE_OS_USERID}"
|
|
{{- end }}
|