Update storage configuration

* Specify a volumeName for the persistant volume claims (on initial deploy
  to staging, these PVC's got bound to random volume...)
* Name the PVC's to exactly match the volume names, including a -stg suffix
  for staging
* Reduce the requested size for the redis volume to 1Gi.

playbooks/openshift-apps/flatpak-indexer.yml

@@ -33,7 +33,7 @@
 
   - role: openshift/object
     app: flatpak-indexer
-    file: storage.yml
+    template: storage.yml
     objectname: storage.yml
 
   - role: openshift/object

roles/openshift-apps/flatpak-indexer/files/storage.yml

@@ -1,24 +0,0 @@
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: flatpak-indexer-storage
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 5Gi
-  storageClassName: ""
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: flatpak-indexer-redis-storage
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 5Gi
-  storageClassName: ""

roles/openshift-apps/flatpak-indexer/templates/deploymentconfig.yml

@@ -63,7 +63,7 @@ spec:
         name: koji-conf-volume
       - name: index-output-volume
         persistentVolumeClaim:
-          claimName: flatpak-indexer-storage
+          claimName: flatpak-indexer-storage{{ '-stg' if env == 'staging' else '' }}
   test: false
   triggers:
   - type: ConfigChange
@@ -142,7 +142,7 @@ spec:
         name: indexer-config-volume
       - name: index-output-volume
         persistentVolumeClaim:
-          claimName: flatpak-indexer-storage
+          claimName: flatpak-indexer-storage{{ '-stg' if env == 'staging' else '' }}
   test: false
   triggers:
   - type: ConfigChange
@@ -214,7 +214,7 @@ spec:
       volumes:
       - name: redis-data-volume
         persistentVolumeClaim:
-          claimName: flatpak-indexer-redis-storage
+          claimName: flatpak-indexer-redis-storage{{ '-stg' if env == 'staging' else '' }}
   test: false
   triggers:
   - type: ConfigChange

roles/openshift-apps/flatpak-indexer/templates/storage.yml

@@ -0,0 +1,24 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: flatpak-indexer-storage{{ '-stg' if env == 'staging' else '' }}
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 5Gi
+  volumeName: flatpak-indexer-redis-storage{{ '-stg' if env == 'staging' else '' }}
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: flatpak-indexer-redis-storage{{ '-stg' if env == 'staging' else '' }}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
+  volumeName: flatpak-indexer-redis-storage{{ '-stg' if env == 'staging' else '' }}