diff --git a/roles/openshift-apps/elections/files/deploymentconfig.yml b/roles/openshift-apps/elections/files/deploymentconfig.yml index c05314d4e3..912d9c2563 100644 --- a/roles/openshift-apps/elections/files/deploymentconfig.yml +++ b/roles/openshift-apps/elections/files/deploymentconfig.yml @@ -40,6 +40,18 @@ spec: - name: config-volume mountPath: /opt/app-root/config/ readOnly: true + - name: fedora-messaging-config-volume + mountPath: /etc/fedora-messaging + 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-cert-volume + mountPath: /etc/pki/rabbitmq/cert + readOnly: true readinessProbe: timeoutSeconds: 1 initialDelaySeconds: 5 @@ -56,6 +68,18 @@ spec: - name: config-volume configMap: name: elections-configmap + - name: fedora-messaging-config-volume + configMap: + name: elections-fedora-messaging-configmap + - name: fedora-messaging-ca-volume + secret: + secretName: elections-fedora-messaging-ca + - name: fedora-messaging-key-volume + secret: + secretName: elections-fedora-messaging-key + - name: fedora-messaging-cert-volume + secret: + secretName: elections-fedora-messaging-crt triggers: - type: ConfigChange diff --git a/roles/openshift-apps/elections/templates/configmap.yml b/roles/openshift-apps/elections/templates/configmap.yml index 3c82fa7442..84a0f31529 100644 --- a/roles/openshift-apps/elections/templates/configmap.yml +++ b/roles/openshift-apps/elections/templates/configmap.yml @@ -1,3 +1,4 @@ +{% macro load_file(filename) %}{% include filename %}{%- endmacro -%} --- apiVersion: v1 kind: ConfigMap @@ -5,9 +6,18 @@ metadata: name: elections-configmap labels: app: elections -{% macro load_file(filename) %}{% include filename %}{%- endmacro -%} data: alembic.ini: |- {{ load_file('alembic.ini') | indent }} + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: elections-fedora-messaging-configmap + labels: + app: elections +data: fedora-elections.cfg: |- {{ load_file('fedora-elections.cfg') | indent }} +