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

check-compose: gah fix more settings

Browse source 
why is copy/paste so hard I am terrible at software someone fire
me

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-06-19 16:23:48 -07:00
parent 33bf682fd5
commit d18aa2af4a
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
inventory/group_vars/checkcompose_common
View file

@ -2,13 +2,11 @@
# to create queues on the infra AMQP broker, by broker config
checkcompose_amqp_passive: true
# fedora-messaging job scheduler settings: most of these are the same
# for prod and stg as they both must listen for prod messages. Only
# the queue names differs
checkcompose_amqp_url: "amqps://openqa:@rabbitmq.fedoraproject.org/%2Fpubsub"
checkcompose_amqp_cacert: /etc/fedora-messaging/cacert.pem
checkcompose_amqp_key: /etc/pki/fedora-messaging/openqa-key.pem
checkcompose_amqp_cert: /etc/pki/fedora-messaging/openqa-cert.pem
# fedora-messaging compose report sender settings
checkcompose_amqp_url: "amqps://openqa{{ checkcompose_env_suffix }}:@rabbitmq{{ checkcompose_env_suffix }}.fedoraproject.org/%2Fpubsub"
checkcompose_amqp_cacert: /etc/fedora-messaging/cacert{{ checkcompose_env_suffix }}.pem
checkcompose_amqp_key: /etc/pki/fedora-messaging/openqa{{ checkcompose_env_suffix }}-key.pem
checkcompose_amqp_cert: /etc/pki/fedora-messaging/openqa{{ checkcompose_env_suffix }}-cert.pem
checkcompose_amqp_queue: "openqa{{ checkcompose_env_suffix }}_checkcomp"
checkcompose_amqp_routing_keys: ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"]

2
playbooks/groups/openqa.yml
View file

@ -94,7 +94,7 @@
# check-compose queue, we still use openqa auth for this as it's
# easy that way
- role: rabbit/queue
username: "openqa{{ openqa_env_suffix }}"
username: "openqa{{ checkcompose_env_suffix }}"
queue_name: "openqa{{ checkcompose_env_suffix }}_checkcomp"
routing_keys:
- "org.fedoraproject.{{ deployment_type }}.openqa.job.done"