From 44c8d7d42db6f825450dd10b92ecd505a6d8f3d6 Mon Sep 17 00:00:00 2001
From: Leonardo Rossetti <lrossett@redhat.com>
Date: Mon, 13 Jun 2022 14:01:03 -0300
Subject: [PATCH] removing deployment_type jina cond.

---
 .../openshift-apps/resultsdb/templates/backend/configmaps.yml | 2 --
 .../resultsdb/templates/backend/deploymentconfigs.yml         | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/roles/openshift-apps/resultsdb/templates/backend/configmaps.yml b/roles/openshift-apps/resultsdb/templates/backend/configmaps.yml
index a1a9f1b878..40e3a0ed28 100644
--- a/roles/openshift-apps/resultsdb/templates/backend/configmaps.yml
+++ b/roles/openshift-apps/resultsdb/templates/backend/configmaps.yml
@@ -25,7 +25,6 @@ data:
         Require valid-user
       </LimitExcept>
     </Location>
-{% if deployment_type is defined and deployment_type not in ['local', 'dev'] %}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -47,4 +46,3 @@ data:
     ca_cert = "/etc/pki/rabbitmq/ca/resultsdb.ca"
     keyfile = "/etc/pki/rabbitmq/key/resultsdb.key"
     certfile = "/etc/pki/rabbitmq/crt/resultsdb.crt"
-{% endif %}
diff --git a/roles/openshift-apps/resultsdb/templates/backend/deploymentconfigs.yml b/roles/openshift-apps/resultsdb/templates/backend/deploymentconfigs.yml
index a829280451..6e4a0b87b9 100644
--- a/roles/openshift-apps/resultsdb/templates/backend/deploymentconfigs.yml
+++ b/roles/openshift-apps/resultsdb/templates/backend/deploymentconfigs.yml
@@ -69,7 +69,6 @@ spec:
             - name: httpd-config-volume
               mountPath: /etc/httpd/conf.d
               readOnly: true
-{% if deployment_type is defined and deployment_type not in ['local', 'dev']%}
             - name: fedora-messaging-ca-volume
               mountPath: /etc/pki/rabbitmq/ca
               readOnly: true
@@ -82,7 +81,6 @@ spec:
             - name: fedora-messaging-config-volume
               mountPath: /etc/fedora-messaging
               readOnly: true
-{% endif %}
           readinessProbe:
             timeoutSeconds: 1
             initialDelaySeconds: 5
@@ -109,7 +107,6 @@ spec:
         - name: httpd-config-volume
           configMap:
             name: "resultsdb-httpd-config"
-{% if deployment_type is defined and deployment_type not in ['local', 'dev']%}
         - name: fedora-messaging-config-volume
           configMap:
             name: fedora-messaging-configmap
@@ -122,6 +119,5 @@ spec:
         - name: fedora-messaging-key-volume
           secret:
             secretName: resultsdb-fedora-messaging-key
-{% endif %}
   triggers:
     - type: ConfigChange