openstack/openstack-helm
Code Issues Proposed changes

htk: do not include region in service domain/project desc

Browse Source 
It is not in any installation guide to have a separate service domain
and service project per region in a multi-region installation so drop
the region name from the description when creating those resources.

Change-Id: I20d90b77c6169c9e5463f57ec1c5c85a5671ee4b
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
This commit is contained in:
Doug Goldstein
2025-09-14 13:55:57 -05:00
parent a4df9c709e
commit 14ad96fc0d
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl
View File

@@ -33,7 +33,7 @@ set -ex
# Manage domain # Manage domain
SERVICE_OS_DOMAIN_ID=$(openstack domain create --or-show --enable -f value -c id \ 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}" \ --description="Service Domain for ${SERVICE_OS_DOMAIN_NAME}" \
"${SERVICE_OS_DOMAIN_NAME}") "${SERVICE_OS_DOMAIN_NAME}")
# Display domain # Display domain

6
helm-toolkit/templates/scripts/_ks-user.sh.tpl
View File

@@ -39,7 +39,7 @@ then
else else
# Manage project domain # Manage project domain
PROJECT_DOMAIN_ID=$(openstack domain create --or-show --enable -f value -c id \ PROJECT_DOMAIN_ID=$(openstack domain create --or-show --enable -f value -c id \
--description="Domain for ${SERVICE_OS_REGION_NAME}/${SERVICE_OS_PROJECT_DOMAIN_NAME}" \ --description="Domain for ${SERVICE_OS_PROJECT_DOMAIN_NAME}" \
"${SERVICE_OS_PROJECT_DOMAIN_NAME}") "${SERVICE_OS_PROJECT_DOMAIN_NAME}")
fi fi
@@ -49,14 +49,14 @@ then
else else
# Manage user domain # Manage user domain
USER_DOMAIN_ID=$(openstack domain create --or-show --enable -f value -c id \ USER_DOMAIN_ID=$(openstack domain create --or-show --enable -f value -c id \
--description="Domain for ${SERVICE_OS_REGION_NAME}/${SERVICE_OS_USER_DOMAIN_NAME}" \ --description="Domain for ${SERVICE_OS_USER_DOMAIN_NAME}" \
"${SERVICE_OS_USER_DOMAIN_NAME}") "${SERVICE_OS_USER_DOMAIN_NAME}")
fi fi
shopt -u nocasematch shopt -u nocasematch
# Manage user project # Manage user project
USER_PROJECT_DESC="Service Project for ${SERVICE_OS_REGION_NAME}/${SERVICE_OS_PROJECT_DOMAIN_NAME}" USER_PROJECT_DESC="Service Project for ${SERVICE_OS_PROJECT_DOMAIN_NAME}"
USER_PROJECT_ID=$(openstack project create --or-show --enable -f value -c id \ USER_PROJECT_ID=$(openstack project create --or-show --enable -f value -c id \
--domain="${PROJECT_DOMAIN_ID}" \ --domain="${PROJECT_DOMAIN_ID}" \
--description="${USER_PROJECT_DESC}" \ --description="${USER_PROJECT_DESC}" \

7
releasenotes/notes/helm-toolkit-04996581655d9952.yaml Normal file
View File

@@ -0,0 +1,7 @@
---
helm-toolkit:
- |
The 'service' domain and project are not scoped to regions in most multi-region
installations and will instead be shared so it does not make sense to include
the region name in the description for those.
...