From 7bbdf4f679b0bc3cd96bca6f55d2f5bd329bc7e7 Mon Sep 17 00:00:00 2001
From: Brendan Early <mymindstorm@evermiss.net>
Date: Tue, 4 May 2021 16:29:26 -0500
Subject: [PATCH] Add -stg suffix to packages-static and solr PV claims when
 needed

---
 playbooks/openshift-apps/fedora-packages-static.yml           | 4 ++--
 playbooks/openshift-apps/solr.yml                             | 4 ++--
 .../{files => templates}/deploymentconfig.yml                 | 4 ++--
 .../fedora-packages-static/{files => templates}/storage.yml   | 4 ++--
 .../solr/{files => templates}/deploymentconfig.yml            | 2 +-
 roles/openshift-apps/solr/{files => templates}/storage.yml    | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename roles/openshift-apps/fedora-packages-static/{files => templates}/deploymentconfig.yml (91%)
 rename roles/openshift-apps/fedora-packages-static/{files => templates}/storage.yml (67%)
 rename roles/openshift-apps/solr/{files => templates}/deploymentconfig.yml (94%)
 rename roles/openshift-apps/solr/{files => templates}/storage.yml (73%)

diff --git a/playbooks/openshift-apps/fedora-packages-static.yml b/playbooks/openshift-apps/fedora-packages-static.yml
index 191747a08a..15923e177d 100644
--- a/playbooks/openshift-apps/fedora-packages-static.yml
+++ b/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
diff --git a/playbooks/openshift-apps/solr.yml b/playbooks/openshift-apps/solr.yml
index 3def20137b..f6a81c0b59 100644
--- a/playbooks/openshift-apps/solr.yml
+++ b/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
diff --git a/roles/openshift-apps/fedora-packages-static/files/deploymentconfig.yml b/roles/openshift-apps/fedora-packages-static/templates/deploymentconfig.yml
similarity index 91%
rename from roles/openshift-apps/fedora-packages-static/files/deploymentconfig.yml
rename to roles/openshift-apps/fedora-packages-static/templates/deploymentconfig.yml
index 75d880d95c..a442976270 100644
--- a/roles/openshift-apps/fedora-packages-static/files/deploymentconfig.yml
+++ b/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
diff --git a/roles/openshift-apps/fedora-packages-static/files/storage.yml b/roles/openshift-apps/fedora-packages-static/templates/storage.yml
similarity index 67%
rename from roles/openshift-apps/fedora-packages-static/files/storage.yml
rename to roles/openshift-apps/fedora-packages-static/templates/storage.yml
index 224634767f..9f5ed9ac9a 100644
--- a/roles/openshift-apps/fedora-packages-static/files/storage.yml
+++ b/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
diff --git a/roles/openshift-apps/solr/files/deploymentconfig.yml b/roles/openshift-apps/solr/templates/deploymentconfig.yml
similarity index 94%
rename from roles/openshift-apps/solr/files/deploymentconfig.yml
rename to roles/openshift-apps/solr/templates/deploymentconfig.yml
index cf44142267..a754c6e32e 100644
--- a/roles/openshift-apps/solr/files/deploymentconfig.yml
+++ b/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
diff --git a/roles/openshift-apps/solr/files/storage.yml b/roles/openshift-apps/solr/templates/storage.yml
similarity index 73%
rename from roles/openshift-apps/solr/files/storage.yml
rename to roles/openshift-apps/solr/templates/storage.yml
index 78aacd9e63..73c02d5885 100644
--- a/roles/openshift-apps/solr/files/storage.yml
+++ b/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