Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

bodhi: Use the correct path for rabbitmq certs.

Browse source 
Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
This commit is contained in:
Randy Barlow 2019-05-10 15:32:40 +00:00
parent e180b0b062
commit 855fde87a0
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
playbooks/openshift-apps/bodhi.yml
View file

@ -39,13 +39,13 @@
app: bodhi app: bodhi
secret_name: bodhi-fedora-messaging-crt secret_name: bodhi-fedora-messaging-crt
key: bodhi-cert.pem key: bodhi-cert.pem
privatefile: "rabbitmq/{{env}}/pki/issued/<app>.crt" privatefile: "rabbitmq/{{env}}/pki/issued/bodhi{{env}}.crt"
when: env == "staging" when: env == "staging"
- role: openshift/secret-file - role: openshift/secret-file
app: bodhi app: bodhi
secret_name: bodhi-fedora-messaging-key secret_name: bodhi-fedora-messaging-key
key: bodhi-key.pem key: bodhi-key.pem
privatefile: "rabbitmq/{{env}}/pki/private/bodhi.key" privatefile: "rabbitmq/{{env}}/pki/private/bodhi{{env}}.key"
when: env == "staging" when: env == "staging"
# When we deploy Bodhi 4.0.0 to production, we can drop these fedmsg secrets. # When we deploy Bodhi 4.0.0 to production, we can drop these fedmsg secrets.
- role: openshift/secret-file - role: openshift/secret-file

4
roles/bodhi2/backend/tasks/main.yml
View file

@ -454,7 +454,7 @@
# The when staging should be dropped when we deploy Bodhi 4.0.0 to production. # The when staging should be dropped when we deploy Bodhi 4.0.0 to production.
- name: Deploy the fedora-messaging cert - name: Deploy the fedora-messaging cert
copy: copy:
src: "{{ private }}/files/rabbitmq/{{env}}/pki/issued/bodhi.crt" src: "{{ private }}/files/rabbitmq/{{env}}/pki/issued/bodhi{{env}}.crt"
dest: /etc/fedora-messaging/bodhi-cert.pem dest: /etc/fedora-messaging/bodhi-cert.pem
mode: 0644 mode: 0644
owner: apache owner: apache
@ -465,7 +465,7 @@
# The when staging should be dropped when we deploy Bodhi 4.0.0 to production. # The when staging should be dropped when we deploy Bodhi 4.0.0 to production.
- name: Deploy the fedora-messaging key - name: Deploy the fedora-messaging key
copy: copy:
src: "{{ private }}/files/rabbitmq/{{env}}/pki/private/bodhi.key" src: "{{ private }}/files/rabbitmq/{{env}}/pki/private/bodhi{{env}}.key"
dest: /etc/fedora-messaging/bodhi-key.pem dest: /etc/fedora-messaging/bodhi-key.pem
mode: 0600 mode: 0600
owner: apache owner: apache