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

cloud-image-uploader: change rabbitmq name to match CN in certificate

Browse source 
The client certificate contains "cloud-image-uploader.stg" for the CN,
so our RabbitMQ name needs to match. Additionally, the queue name needs
to start with the username, so we need to adjust that as well.
This commit is contained in:
Jeremy Cline 2024-04-10 12:49:02 -04:00
parent 3f4c4ea19f
commit 6d9f9ecc68
No known key found for this signature in database
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/cloud-image-uploader.yml
View file

@ -10,8 +10,8 @@
roles:
- role: rabbit/queue
username: "cloud-image-uploader"
queue_name: "cloud-image-uploader"
username: "cloud-image-uploader{{ env_suffix }}"
queue_name: "cloud-image-uploader{{ env_suffix }}"
routing_keys:
- "org.fedoraproject.{{ env }}.buildsys.build.state.change"
thresholds:

4
roles/openshift-apps/cloud-image-uploader/templates/config.toml
View file

@ -2,7 +2,7 @@
# For complete details on all configuration options, see the documentation
# https://fedora-messaging.readthedocs.io/en/latest/configuration.html.
amqp_url = "amqps://cloud-image-uploader:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
amqp_url = "amqps://cloud-image-uploader{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
callback = "fedora_cloud_image_uploader:Uploader"
passive_declares = true
@ -17,7 +17,7 @@ app_url = "https://pagure.io/cloud-image-uploader"
app_contacts_email = "cloud@lists.fedoraproject.org"
[[bindings]]
queue = "cloud-image-uploader"
queue = "cloud-image-uploader{{ env_suffix }}"
exchange = "amq.topic"
routing_keys = ["org.fedoraproject.{{ env }}.buildsys.build.state.change"]