openstack/openstack-helm
Code Issues Proposed changes

Glance: Update management jobs to fail on incorrect config

Browse Source 
This PS updates the glance management jobs to fail on incorrect
configuration, or abnormal interaction between components.

Change-Id: I87eb8f28bfaa93467f2690d8a7f92b062f9d257f
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2018-07-06 09:38:41 -05:00
parent 32934d8826
commit 640cdc1326
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance/templates/bin/_bootstrap.sh.tpl
View File

@ -23,7 +23,7 @@ cd /tmp/images
{{ range .Values.bootstrap.structured.images }} {{ range .Values.bootstrap.structured.images }}
openstack image show {{ .name | quote }} || \ openstack image show {{ .name | quote }} || \
{ curl -O {{ .source_url }}{{ .image_file }}; \ { curl --fail -sSL -O {{ .source_url }}{{ .image_file }}; \
openstack image create {{ .name | quote }} \ openstack image create {{ .name | quote }} \
{{ if .id -}} --id {{ .id }} {{ end -}} \ {{ if .id -}} --id {{ .id }} {{ end -}} \
--min-disk {{ .min_disk }} \ --min-disk {{ .min_disk }} \

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

@ -35,7 +35,7 @@ elif [ "x$STORAGE_BACKEND" == "xswift" ]; then
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} -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 -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}" \
-H "X-Account-Meta-Temp-URL-Key: ${SWIFT_TMPURL_KEY}" -H "X-Account-Meta-Temp-URL-Key: ${SWIFT_TMPURL_KEY}"
elif [ "x$STORAGE_BACKEND" == "xrbd" ]; then elif [ "x$STORAGE_BACKEND" == "xrbd" ]; then