diff --git a/glance/templates/bin/_bootstrap.sh.tpl b/glance/templates/bin/_bootstrap.sh.tpl
index ddd6ebe960..4e55a0c1d0 100644
--- a/glance/templates/bin/_bootstrap.sh.tpl
+++ b/glance/templates/bin/_bootstrap.sh.tpl
@@ -23,7 +23,7 @@ cd /tmp/images
 
 {{ range .Values.bootstrap.structured.images }}
 openstack image show {{ .name  | quote }} || \
-  { curl -O {{ .source_url }}{{ .image_file }}; \
+  { curl --fail -sSL -O {{ .source_url }}{{ .image_file }}; \
   openstack image create {{ .name | quote }} \
   {{ if .id -}} --id {{ .id }} {{ end -}} \
   --min-disk {{ .min_disk }} \
diff --git a/glance/templates/bin/_storage-init.sh.tpl b/glance/templates/bin/_storage-init.sh.tpl
index 4f978b2e68..4dd5aad6d9 100644
--- a/glance/templates/bin/_storage-init.sh.tpl
+++ b/glance/templates/bin/_storage-init.sh.tpl
@@ -35,7 +35,7 @@ elif [ "x$STORAGE_BACKEND" == "xswift" ]; then
   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_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-Account-Meta-Temp-URL-Key: ${SWIFT_TMPURL_KEY}"
 elif [ "x$STORAGE_BACKEND" == "xrbd" ]; then