openstack/openstack-helm
Code Issues Proposed changes

Use --region option to prevent OS_SWIFT_ENDPOINT_PREFIX is broken in storage-init.sh

Browse Source 
If there are multi regions, OS_SWIFT_ENDPOINT_PREFIX has broken url. To prevent this problem, use --region option.

story: 2010964
task: 49071
Change-Id: I1bbd76616ab9c9ec7a8554c7f382642b2dbe0661
This commit is contained in:
Keonwoo.kim 2023-11-10 01:15:47 +09:00
parent 488481c332
commit 88688f9199
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance/Chart.yaml
View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Glance description: OpenStack-Helm Glance
name: glance name: glance
version: 0.4.15 version: 0.4.16
home: https://docs.openstack.org/glance/latest/ home: https://docs.openstack.org/glance/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png
sources: sources:

2
glance/templates/bin/_storage-init.sh.tpl
View File

@ -36,7 +36,7 @@ elif [ "x$STORAGE_BACKEND" == "xswift" ]; then
: ${OS_INTERFACE:="internal"} : ${OS_INTERFACE:="internal"}
OS_TOKEN="$(openstack token issue -f value -c id)" OS_TOKEN="$(openstack token issue -f value -c id)"
OS_PROJECT_ID="$(openstack project show service -f value -c id)" OS_PROJECT_ID="$(openstack project show service -f value -c id)"
OS_SWIFT_ENDPOINT_PREFIX="$(openstack endpoint list --service swift --interface ${OS_INTERFACE} -f value -c URL | awk -F '$' '{ print $1 }')" OS_SWIFT_ENDPOINT_PREFIX="$(openstack endpoint list --service swift --interface ${OS_INTERFACE} --region ${OS_REGION_NAME} -f value -c URL | awk -F '$' '{ print $1 }')"
OS_SWIFT_SCOPED_ENDPOINT="${OS_SWIFT_ENDPOINT_PREFIX}${OS_PROJECT_ID}" OS_SWIFT_SCOPED_ENDPOINT="${OS_SWIFT_ENDPOINT_PREFIX}${OS_PROJECT_ID}"
curl --fail -i -X POST "${OS_SWIFT_SCOPED_ENDPOINT}" \ curl --fail -i -X POST "${OS_SWIFT_SCOPED_ENDPOINT}" \
-H "X-Auth-Token: ${OS_TOKEN}" \ -H "X-Auth-Token: ${OS_TOKEN}" \

1
releasenotes/notes/glance.yaml
View File

@ -49,4 +49,5 @@ glance:
- 0.4.13 Add Ubuntu Jammy overrides - 0.4.13 Add Ubuntu Jammy overrides
- 0.4.14 Bump Cirros version to 0.6.2 - 0.4.14 Bump Cirros version to 0.6.2
- 0.4.15 Add 2023.2 Ubuntu Jammy overrides - 0.4.15 Add 2023.2 Ubuntu Jammy overrides
- 0.4.16 Use --region option to prevent OS_SWIFT_ENDPOINT_PREFIX is broken in storage-init.sh
... ...