openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Fix ks-user script case matching for domain"

Browse Source
This commit is contained in:
Zuul 2020-10-21 17:51:04 +00:00 committed by Gerrit Code Review
commit 9332c2961e
2 changed files with 5 additions and 1 deletions
helm-toolkit
Chart.yaml
templates/scripts
_ks-user.sh.tpl

2
helm-toolkit/Chart.yaml

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm Helm-Toolkit
name: helm-toolkit
version: 0.1.2
version: 0.1.3
home: https://docs.openstack.org/openstack-helm
icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
sources:

4
helm-toolkit/templates/scripts/_ks-user.sh.tpl

@ -31,6 +31,8 @@ limitations under the License.
set -ex
shopt -s nocasematch
if [[ "${SERVICE_OS_PROJECT_DOMAIN_NAME}" == "Default" ]]
then
PROJECT_DOMAIN_ID="default"
@ -51,6 +53,8 @@ else
"${SERVICE_OS_USER_DOMAIN_NAME}")
fi
shopt -u nocasematch
# Manage user project
USER_PROJECT_DESC="Service Project for ${SERVICE_OS_REGION_NAME}/${SERVICE_OS_PROJECT_DOMAIN_NAME}"
USER_PROJECT_ID=$(openstack project create --or-show --enable -f value -c id \