Merge branch 'sulochan-glance_store'

helm-configs.example/glance/glance-helm-overrides.yaml

@@ -1,5 +1,5 @@
 # radosgw, rbd, swift or pvc
-storage: pvc  # This should likely be set to swift or rbd in production
+storage: swift # Use override to switch to pvc or rbd
 
 labels:
   api:
@@ -251,6 +251,10 @@ conf:
       rbd_store_ceph_conf: /etc/ceph/ceph.conf
       filesystem_store_datadir: /var/lib/glance/images
       default_swift_reference: ref1
+      swift_auth_address: https://swift.cluster.local
+      swift_auth_version: 3
+      swift_user: glance:glance-store
+      swift_password: override_from_your_secrets_files
       swift_store_container: glance
       swift_store_create_container_on_put: true
       swift_store_config_file: /etc/glance/swift-store.conf
@@ -367,6 +371,11 @@ conf:
     auth_address = {{ tuple "ceph_object_store" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
     user = {{ .Values.endpoints.ceph_object_store.auth.glance.username }}:swift
     key = {{ .Values.endpoints.ceph_object_store.auth.glance.password }}
+    {{- else if eq .Values.storage "swift" }}
+    auth_version = {{ .Values.conf.glance.glance_store.swift_auth_version }}
+    auth_address = {{ .Values.conf.glance.glance_store.swift_auth_address }}
+    user = {{ .Values.conf.glance.glance_store.swift_user }}
+    key = {{ .Values.conf.glance.glance_store.swift_password }}
     {{- else }}
     user = {{ .Values.endpoints.identity.auth.glance.project_name }}:{{ .Values.endpoints.identity.auth.glance.username }}
     key = {{ .Values.endpoints.identity.auth.glance.password }}