From b6e8b0c9f51b102c0b1b42b00bbfe14ca9e314aa Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 19 Oct 2017 01:46:51 +0000
Subject: [PATCH] Ah, it is only the backend containers that need these mounts.

---
 .../greenwave/files/deploymentconfig.yml      | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/roles/openshift-apps/greenwave/files/deploymentconfig.yml b/roles/openshift-apps/greenwave/files/deploymentconfig.yml
index 4e7713b7ec..1158312af4 100644
--- a/roles/openshift-apps/greenwave/files/deploymentconfig.yml
+++ b/roles/openshift-apps/greenwave/files/deploymentconfig.yml
@@ -26,12 +26,6 @@ spec:
         - name: config-volume
           mountPath: /etc/greenwave
           readOnly: true
-        - name: fedmsg-key-volume
-          mountPath: /etc/pki/fedmsg/key
-          readOnly: true
-        - name: fedmsg-crt-volume
-          mountPath: /etc/pki/fedmsg/crt
-          readOnly: true
         readinessProbe:
           timeoutSeconds: 1
           initialDelaySeconds: 5
@@ -51,13 +45,6 @@ spec:
       - name: config-volume
         configMap:
           name: greenwave-configmap
-      # This secret volume gets set up in the playbook
-      - name: fedmsg-key-volume
-        secret:
-          secretName: greenwave-fedmsg-key
-      - name: fedmsg-crt-volume
-        secret:
-          secretName: greenwave-fedmsg-crt
   triggers:
   - type: ImageChange
     imageChangeParams:
@@ -98,6 +85,12 @@ spec:
         - name: fedmsg-config-volume
           mountPath: /etc/fedmsg-greenwave.d
           readOnly: true
+        - name: fedmsg-key-volume
+          mountPath: /etc/pki/fedmsg/key
+          readOnly: true
+        - name: fedmsg-crt-volume
+          mountPath: /etc/pki/fedmsg/crt
+          readOnly: true
         resources:
           limits:
             memory: 384Mi
@@ -105,6 +98,13 @@ spec:
       - name: fedmsg-config-volume
         configMap:
           name: greenwave-fedmsg-configmap
+      # This secret volume gets set up in the playbook
+      - name: fedmsg-key-volume
+        secret:
+          secretName: greenwave-fedmsg-key
+      - name: fedmsg-crt-volume
+        secret:
+          secretName: greenwave-fedmsg-crt
   triggers:
   - type: ImageChange
     imageChangeParams: