Merge "Enable tls for glance storage init"
This commit is contained in:
commit
48ab9f6961
@ -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.1.6
|
version: 0.1.7
|
||||||
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:
|
||||||
|
@ -24,6 +24,11 @@ if [ "x$STORAGE_BACKEND" == "xrbd" ]; then
|
|||||||
trap cleanup EXIT
|
trap cleanup EXIT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
SCHEME={{ tuple "object_store" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" }}
|
||||||
|
if [[ "$SCHEME" == "https" && -f /etc/ssl/certs/openstack-helm.crt ]]; then
|
||||||
|
export CURL_CA_BUNDLE="/etc/ssl/certs/openstack-helm.crt"
|
||||||
|
fi
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
if [ "x$STORAGE_BACKEND" == "xpvc" ]; then
|
if [ "x$STORAGE_BACKEND" == "xpvc" ]; then
|
||||||
echo "No action required."
|
echo "No action required."
|
||||||
|
@ -7,3 +7,4 @@ glance:
|
|||||||
- 0.1.4 Update RBAC apiVersion from /v1beta1 to /v1
|
- 0.1.4 Update RBAC apiVersion from /v1beta1 to /v1
|
||||||
- 0.1.5 Change Issuer to ClusterIssuer
|
- 0.1.5 Change Issuer to ClusterIssuer
|
||||||
- 0.1.6 Update glance default policy values
|
- 0.1.6 Update glance default policy values
|
||||||
|
- 0.1.7 Update storage init script with cacert
|
||||||
|
Loading…
Reference in New Issue
Block a user