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

the-new-hotness, release-monitoring: Add env_suffix

Browse source 
Signed-off-by: Michal Konečný <mkonecny@redhat.com>
This commit is contained in:
Michal Konečný 2019-02-28 15:48:45 +01:00
parent c9a1543185
commit 98fff91df9
2 changed files with 2 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

16
playbooks/openshift-apps/release-monitoring.yml
View file

@ -13,7 +13,7 @@
tasks: tasks:
- name: Create the RabbitMQ user - name: Create the RabbitMQ user
rabbitmq_user: rabbitmq_user:
user: "anitya" user: "anitya{{ env_suffix }}"
vhost: /pubsub vhost: /pubsub
read_priv: "^anitya.*$" read_priv: "^anitya.*$"
write_priv: "amq.topic" write_priv: "amq.topic"
@ -49,25 +49,11 @@
secret_name: release-monitoring-fedora-messaging-key secret_name: release-monitoring-fedora-messaging-key
key: fedora-messaging-release-monitoring.key key: fedora-messaging-release-monitoring.key
privatefile: "rabbitmq/{{env}}/pki/private/anitya{{env_suffix}}.key" privatefile: "rabbitmq/{{env}}/pki/private/anitya{{env_suffix}}.key"
when: env == "staging"
- role: openshift/secret-file - role: openshift/secret-file
app: release-monitoring app: release-monitoring
secret_name: release-monitoring-fedora-messaging-cert secret_name: release-monitoring-fedora-messaging-cert
key: fedora-messaging-release-monitoring.crt key: fedora-messaging-release-monitoring.crt
privatefile: "rabbitmq/{{env}}/pki/issued/anitya{{env_suffix}}.crt" privatefile: "rabbitmq/{{env}}/pki/issued/anitya{{env_suffix}}.crt"
when: env == "staging"
- role: openshift/secret-file
app: release-monitoring
secret_name: release-monitoring-fedora-messaging-key
key: fedora-messaging-release-monitoring.key
privatefile: "rabbitmq/{{env}}/pki/private/anitya.key"
when: env != "staging"
- role: openshift/secret-file
app: release-monitoring
secret_name: release-monitoring-fedora-messaging-cert
key: fedora-messaging-release-monitoring.crt
privatefile: "rabbitmq/{{env}}/pki/issued/anitya.crt"
when: env != "staging"
- role: openshift/object - role: openshift/object
app: release-monitoring app: release-monitoring
file: imagestream.yml file: imagestream.yml

18
playbooks/openshift-apps/the-new-hotness.yml
View file

@ -10,7 +10,7 @@
roles: roles:
- role: rabbit/queue - role: rabbit/queue
username: the-new-hotness username: the-new-hotness{{ env_suffix }}
queue_name: the-new-hotness queue_name: the-new-hotness
routing_keys: routing_keys:
- "#" - "#"
@ -32,28 +32,12 @@
secret_name: the-new-hotness-fedora-messaging-key secret_name: the-new-hotness-fedora-messaging-key
key: fedora-messaging-the-new-hotness.key key: fedora-messaging-the-new-hotness.key
privatefile: "rabbitmq/{{env}}/pki/private/the-new-hotness{{env_suffix}}.key" privatefile: "rabbitmq/{{env}}/pki/private/the-new-hotness{{env_suffix}}.key"
when: env == "staging"
- role: openshift/secret-file - role: openshift/secret-file
app: the-new-hotness app: the-new-hotness
secret_name: the-new-hotness-fedora-messaging-cert secret_name: the-new-hotness-fedora-messaging-cert
key: fedora-messaging-the-new-hotness.crt key: fedora-messaging-the-new-hotness.crt
privatefile: "rabbitmq/{{env}}/pki/issued/the-new-hotness{{env_suffix}}.crt" privatefile: "rabbitmq/{{env}}/pki/issued/the-new-hotness{{env_suffix}}.crt"
when: env == "staging"
- role: openshift/secret-file
app: the-new-hotness
secret_name: the-new-hotness-fedora-messaging-key
key: fedora-messaging-the-new-hotness.key
privatefile: "rabbitmq/{{env}}/pki/private/the-new-hotness.key"
when: env != "staging"
- role: openshift/secret-file
app: the-new-hotness
secret_name: the-new-hotness-fedora-messaging-cert
key: fedora-messaging-the-new-hotness.crt
privatefile: "rabbitmq/{{env}}/pki/issued/the-new-hotness.crt"
when: env != "staging"
- role: openshift/object - role: openshift/object
app: the-new-hotness app: the-new-hotness