Waiverdb: configure staging environment to use fedora-messaging

Signed-off-by: Clement Verna <cverna@tutanota.com>

playbooks/openshift-apps/waiverdb.yml

@@ -30,15 +30,21 @@
       template: client_secrets.json
     - role: openshift/secret-file
       app: waiverdb
-    secret_name: waiverdb-fedmsg-key
+      secret_name: waiverdb-fedora-messaging-key
-    key: fedmsg-waiverdb.key
+      key: waiverdb.key
-    privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.stg.fedoraproject.org.key
+      privatefile: "rabbitmq/{{env}}/pki/private/waiverdb{{env_suffix}}.key"
       when: env == "staging"
     - role: openshift/secret-file
       app: waiverdb
-    secret_name: waiverdb-fedmsg-crt
+      secret_name: waiverdb-fedora-messaging-crt
-    key: fedmsg-waiverdb.crt
+      key: waiverdb.crt
-    privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.stg.fedoraproject.org.crt
+      privatefile: "rabbitmq/{{env}}/pki/private/waiverdb{{env_suffix}}.crt"
+      when: env == "staging"
+    - role: openshift/secret-file
+      app: waiverdb
+      secret_name: waiverdb-fedora-messaging-ca
+      key: waiverdb.ca
+      privatefile: "rabbitmq/{{env}}/pki/private/ca.crt"
       when: env == "staging"
     - role: openshift/secret-file
       app: waiverdb

roles/openshift-apps/waiverdb/templates/config.toml

@@ -0,0 +1,15 @@
+# Configuration for fedora-messaging. This file is in the TOML format.
+# For complete details on all configuration options, see the documentation.
+
+amqp_url = "amqps://waiverdb{{ env_suffix }}:@rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org/%2Fpubsub"
+
+{% if env == "staging" %}
+topic_prefix = "org.fedoraproject.stg"
+{% else %}
+topic_prefix = "org.fedoraproject.prod"
+{% endif %}
+
+[tls]
+ca_cert = "/etc/pki/rabbitmq/ca/waiverdb.ca"
+keyfile = "/etc/pki/rabbitmq/key/waiverdb.key"
+certfile = "/etc/pki/rabbitmq/crt/waiverdb.crt"

roles/openshift-apps/waiverdb/templates/configmap.yml

@@ -48,3 +48,16 @@ data:
       relay_inbound=["tcp://busgateway01.phx2.fedoraproject.org:9941"],
 {% endif %}
     )
+{% if env == 'staging' %}
+---
+- apiVersion: v1
+  kind: ConfigMap
+  metadata:
+    name: fedora-messaging-configmap
+    labels:
+      app: waiverdb
+{% macro load_file(filename) %}{% include filename %}{%- endmacro -%}
+  data:
+    config.toml: |-
+      {{ load_file('config.toml') | indent }}
+{% endif %}

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

@@ -37,18 +37,33 @@ spec:
         - name: config-volume
           mountPath: /etc/waiverdb
           readOnly: true
-        - name: fedmsg-config-volume
-          mountPath: /etc/fedmsg-waiverdb.d
-          readOnly: true
         - name: secret-volume
           mountPath: /etc/secret
           readOnly: true
+{% if env == 'staging' %}
+        - name: fedora-messaging-ca-volume
+          mountPath: /etc/pki/rabbitmq/ca
+          readOnly: true
+        - name: fedora-messaging-key-volume
+          mountPath: /etc/pki/rabbitmq/key
+          readOnly: true
+        - name: fedora-messaging-crt-volume
+          mountPath: /etc/pki/rabbitmq/crt
+          readOnly: true
+        - name: fedora-messaging-config-volume
+          mountPath: /etc/fedora-messaging
+          readOnly: true
+{% else %}
         - name: fedmsg-key-volume
           mountPath: /etc/pki/fedmsg/key
           readOnly: true
         - name: fedmsg-crt-volume
           mountPath: /etc/pki/fedmsg/crt
           readOnly: true
+        - name: fedmsg-config-volume
+          mountPath: /etc/fedmsg-waiverdb.d
+          readOnly: true
+{% endif %}
         env:
         - name: DATABASE_PASSWORD
           valueFrom:
@@ -79,18 +94,33 @@ spec:
       - name: config-volume
         configMap:
           name: waiverdb-configmap
-      - name: fedmsg-config-volume
-        configMap:
-          name: waiverdb-fedmsg-configmap
       - name: secret-volume
         secret:
           secretName: waiverdb-secret
+{% if env == 'staging' %}
+      - name: fedora-messaging-certs-volume
+        configMap:
+          name: fedora-messaging-configmap
+      - name: fedora-messaging-ca-volume
+        secret:
+          secretName: waiverdb-fedora-messaging-ca
+      - name: fedora-messaging-cert-volume
+        secret:
+          secretName: waiverdb-fedora-messaging-crt
+      - name: fedora-messaging-key-volume
+        secret:
+          secretName: waiverdb-fedora-messaging-key
+{% else %}
+      - name: fedmsg-config-volume
+        configMap:
+          name: waiverdb-fedmsg-configmap
       - name: fedmsg-key-volume
         secret:
           secretName: waiverdb-fedmsg-key
       - name: fedmsg-crt-volume
         secret:
           secretName: waiverdb-fedmsg-crt
+{% endif %}
   triggers:
   - type: ImageChange
     imageChangeParams: