Add -stg suffix to packages-static and solr PV claims when needed

playbooks/openshift-apps/fedora-packages-static.yml

@@ -27,7 +27,7 @@
 
   - role: openshift/object
     app: fedora-packages-static
-    file: storage.yml
+    template: storage.yml
     objectname: storage.yml
 
   - role: openshift/object
@@ -54,5 +54,5 @@
 
   - role: openshift/object
     app: fedora-packages-static
-    file: deploymentconfig.yml
+    template: deploymentconfig.yml
     objectname: deploymentconfig.yml

playbooks/openshift-apps/solr.yml

@@ -22,7 +22,7 @@
 
   - role: openshift/object
     app: solr
-    file: storage.yml
+    template: storage.yml
     objectname: storage.yml
 
   - role: openshift/object
@@ -37,7 +37,7 @@
 
   - role: openshift/object
     app: solr
-    file: deploymentconfig.yml
+    template: deploymentconfig.yml
     objectname: deploymentconfig.yml
 
 - name: Link solr and fedora-packages-static networks

roles/openshift-apps/fedora-packages-static/templates/deploymentconfig.yml

@@ -61,10 +61,10 @@ spec:
       volumes:
       - name: data-volume
         persistentVolumeClaim:
-            claimName: fedora-packages-static-storage
+          claimName: fedora-packages-static-storage{{ '-stg' if env == 'staging' else '' }}
       - name: db-volume
         persistentVolumeClaim:
-          claimName: fedora-packages-static-db-storage
+          claimName: fedora-packages-static-db-storage{{ '-stg' if env == 'staging' else '' }}
 
   triggers:
   - type: ConfigChange

roles/openshift-apps/fedora-packages-static/templates/storage.yml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: fedora-packages-static-storage
+  name: fedora-packages-static-storage{{ '-stg' if env == 'staging' else '' }}
 spec:
   accessModes:
     - ReadWriteOnce
@@ -14,7 +14,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: fedora-packages-static-db-storage
+  name: fedora-packages-static-db-storage{{ '-stg' if env == 'staging' else '' }}
 spec:
   accessModes:
     - ReadWriteOnce

roles/openshift-apps/solr/templates/deploymentconfig.yml

@@ -51,7 +51,7 @@ spec:
       volumes:
       - name: data-volume
         persistentVolumeClaim:
-            claimName: solr-storage
+            claimName: solr-storage{{ '-stg' if env == 'staging' else '' }}
       - name: config-volume
         configMap:
           name: solr-configmap

roles/openshift-apps/solr/templates/storage.yml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: solr-storage
+  name: solr-storage{{ '-stg' if env == 'staging' else '' }}
 spec:
   accessModes:
     - ReadWriteOnce