fedora-messaging config

roles/openshift-apps/resultsdb/defaults/main.yml

@@ -1,4 +1,4 @@
-resultsdb_database: true
+resultsdb_publish: true
 resultsdb_test_id: 'test'
 resultsdb_mod_wsgi_dir: '${MOD_WSGI_MODULES_DIRECTORY}'
 

roles/openshift-apps/resultsdb/templates/configmaps.yml

@@ -25,4 +25,25 @@ data:
       <LimitExcept GET>
         Require valid-user
       </LimitExcept>
-    </Location>
+    </Location>
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: fedora-messaging-configmap
+  labels:
+    app: resultsdb
+data:
+  config.toml: |-
+    amqp_url = "amqps://resultsdb{{ env_suffix }}:@rabbitmq{{ env_suffix }}.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/resultsdb.ca"
+    keyfile = "/etc/pki/rabbitmq/key/resultsdb.key"
+    certfile = "/etc/pki/rabbitmq/crt/resultsdb.crt"

roles/openshift-apps/resultsdb/templates/deploymentconfigs.yml

@@ -57,6 +57,18 @@ spec:
             - name: httpd-config-volume
               mountPath: /etc/httpd/conf.d
               readOnly: true
+            - 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
           readinessProbe:
             timeoutSeconds: 1
             initialDelaySeconds: 5
@@ -83,5 +95,17 @@ spec:
         - name: httpd-config-volume
           configMap:
             name: "resultsdb-test-{{ resultsdb_test_id }}-httpd-config"
+        - name: fedora-messaging-config-volume
+          configMap:
+            name: fedora-messaging-configmap
+        - name: fedora-messaging-ca-volume
+          secret:
+            secretName: resultsdb-fedora-messaging-ca
+        - name: fedora-messaging-crt-volume
+          secret:
+            secretName: resultsdb-fedora-messaging-crt
+        - name: fedora-messaging-key-volume
+          secret:
+            secretName: resultsdb-fedora-messaging-key
   triggers:
     - type: ConfigChange

roles/openshift-apps/resultsdb/templates/secrets.yml

@@ -15,7 +15,7 @@ stringData:
     STREAM_LOGGING = True
     RUN_HOST= '0.0.0.0'
     RUN_PORT = 5001
-    MESSAGE_BUS_PUBLISH = False
+    MESSAGE_BUS_PUBLISH = {{ resultsdb_publish | bool }}
     MESSAGE_BUS_PLUGIN = 'fedmsg'
     MESSAGE_BUS_KWARGS = {'modname': 'resultsdb'}
     ADDITIONAL_RESULT_OUTCOMES = {{ resultsdb_additional_result_outcomes }}