diff --git a/playbooks/openshift-apps/planet.yml b/playbooks/openshift-apps/planet.yml index 59aa28b926..988b93b047 100644 --- a/playbooks/openshift-apps/planet.yml +++ b/playbooks/openshift-apps/planet.yml @@ -81,3 +81,21 @@ app: planet template: cronjob.yml objectname: cronjob.yml + + - role: openshift/secret-file + app: planet + secret_name: planet-fedora-messaging-ca + key: cacert.pem + privatefile: "rabbitmq/{{env}}/pki/ca.crt" + + - role: openshift/secret-file + app: planet + secret_name: planet-fedora-messaging-crt + key: planet-cert.pem + privatefile: "rabbitmq/{{env}}/pki/issued/planet{{env_suffix}}.crt" + + - role: openshift/secret-file + app: planet + secret_name: planet-fedora-messaging-key + key: planet-key.pem + privatefile: "rabbitmq/{{env}}/pki/private/planet{{env_suffix}}.key" diff --git a/roles/openshift-apps/planet/templates/deployment.yml b/roles/openshift-apps/planet/templates/deployment.yml index 7541082f85..71ea967a54 100644 --- a/roles/openshift-apps/planet/templates/deployment.yml +++ b/roles/openshift-apps/planet/templates/deployment.yml @@ -44,6 +44,21 @@ spec: - name: planet-build-storage mountPath: /var/www/html readOnly: false + - name: fedora-messaging-config-volume + mountPath: /etc/fedora-messaging + readOnly: true + - name: fedora-messaging-ca-volume + mountPath: /etc/pki/fedora-messaging/cacert.pem + subPath: cacert.pem + readOnly: true + - name: fedora-messaging-crt-volume + mountPath: /etc/pki/fedora-messaging/planet-cert.pem + subPath: planet-cert.pem + readOnly: true + - name: fedora-messaging-key-volume + mountPath: /etc/pki/fedora-messaging/planet-key.pem + subPath: planet-key.pem + readOnly: true volumes: - name: keytab-volume secret: @@ -54,6 +69,18 @@ spec: - name: ipa-config-volume configMap: name: ipa-client-config + - name: fedora-messaging-config-volume + configMap: + name: fedora-messaging-configmap + - name: fedora-messaging-ca-volume + secret: + secretName: planet-fedora-messaging-ca + - name: fedora-messaging-crt-volume + secret: + secretName: planet-fedora-messaging-crt + - name: fedora-messaging-key-volume + secret: + secretName: planet-fedora-messaging-key - name: planet-build-storage persistentVolumeClaim: claimName: planet-http-storage