Merge "Allow glance to use file method"

glance/templates/deployment-api.yaml

@@ -80,7 +80,7 @@ spec:
               mountPath: /etc/glance/policy.json
               subPath: policy.json
               readOnly: true
-{{- if eq .Values.storage "file" }}
+{{- if eq .Values.storage "pvc" }}
             - name: glance-images
               mountPath: {{ .Values.conf.glance.glance_store.glance.store.filesystem_store_datadir }}
 {{- else }}
@@ -98,7 +98,7 @@ spec:
         - name: glance-etc
           configMap:
             name: glance-etc
-{{- if eq .Values.storage "file" }}
+{{- if eq .Values.storage "pvc" }}
         - name: glance-images
           persistentVolumeClaim:
             claimName: glance-images

glance/templates/pvc-images.yaml

@@ -12,16 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- if eq .Values.storage "file" }}
+{{- if eq .Values.storage "pvc" }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: glance-images
-  annotations:
-    {{ .Values.volume.class_path }}: {{ .Values.volume.class_name }}
 spec:
   accessModes: [ "ReadWriteOnce" ]
   resources:
     requests:
       storage: {{ .Values.volume.size }}
+  storageClassName: {{ .Values.volume.class_name }}
 {{- end }}

glance/values.yaml

@@ -21,6 +21,7 @@ replicas:
   api: 1
   registry: 1
 
+# ceph or pvc
 storage: ceph
 
 labels:
@@ -118,6 +119,7 @@ conf:
           rbd_store_pool: images
           rbd_store_user: admin
           rbd_store_ceph_conf: /etc/ceph/ceph.conf
+          filesystem_store_datadir: /var/lib/glance/store
   paste_registry:
     override:
     append:
@@ -153,7 +155,6 @@ network:
       port: 30091
 
 volume:
-  class_path: volume.beta.kubernetes.io/storage-class
   class_name: general
   size: 2Gi
 

tools/overrides/mvp/glance.yaml

@@ -17,7 +17,7 @@
 # OpenStack-Helm Single node gates, and local development use. It should be
 # kept to the bare minimum required for this purpose.
 
-storage: file
+storage: pvc
 
 conf:
   glance: