openqa amqp: fix stg-on-prod queue names

so, this was working before somehow, but it was pretty clearly
wrong. We were using queues owned by openqa.stg on the prod
rabbitmq instance for the cases where the openQA "stg" consumers
need to listen to prod queues. This can only have been working
with an openqa.stg user on prod, which seems wrong. Instead,
these three consumers should do it the way the relval and
relvalami consumers do - use a queue owned by the "openqa" user,
but with a suffix so they have a different queue from the actual
prod queue. The upshot of this is that in the configs, we should
go from:

amqp_url = "amqps://openqa:@rabbitmq.fedoraproject.org/%2Fpubsub"
...
queue = "openqa.stg_scheduler"

- which is weird and I have no idea how it ever worked - to:

amqp_url = "amqps://openqa:@rabbitmq.fedoraproject.org/%2Fpubsub"
...
queue = "openqa_scheduler_stg"

- which seems much more sensible.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

inventory/group_vars/openqa

@@ -8,6 +8,7 @@ openqa_amqp_this_certfile: "{{ openqa_amqp_prod_certfile }}"
 openqa_amqp_this_keyfile: "{{ openqa_amqp_prod_keyfile }}"
 openqa_amqp_this_url: "{{ openqa_amqp_prod_url }}"
 openqa_amqp_this_username: "{{ openqa_amqp_prod_username }}"
+openqa_amqp_queue_suffix:
 openqa_compose_arches: x86_64,aarch64
 openqa_dbname: openqa
 openqa_dbpassword: "{{ prod_openqa_dbpassword }}"

inventory/group_vars/openqa_lab

@@ -22,6 +22,7 @@ openqa_amqp_this_certfile: "{{ openqa_amqp_stg_certfile }}"
 openqa_amqp_this_keyfile: "{{ openqa_amqp_stg_keyfile }}"
 openqa_amqp_this_url: "{{ openqa_amqp_stg_url }}"
 openqa_amqp_this_username: "{{ openqa_amqp_stg_username }}"
+openqa_amqp_queue_suffix: "_stg"
 
 openqa_assetsize_ppc: 300
 openqa_assetsize_updates_ppc: 100

inventory/group_vars/openqa_servers_common

@@ -53,7 +53,7 @@ openqa_amqp_publisher_url: "{{ openqa_amqp_this_url }}"
 # the queue names differs.
 openqa_amqp_scheduler_cert: "{{ openqa_amqp_prod_certfile }}"
 openqa_amqp_scheduler_key: "{{ openqa_amqp_prod_keyfile }}"
-openqa_amqp_scheduler_queue: "{{ openqa_amqp_this_username }}_scheduler"
+openqa_amqp_scheduler_queue: "{{ openqa_amqp_prod_username }}_scheduler{{ openqa_amqp_queue_suffix }}"
 openqa_amqp_scheduler_routing_keys: ["org.fedoraproject.prod.pungi.compose.status.change", "org.fedoraproject.prod.bodhi.update.request.testing", "org.fedoraproject.prod.bodhi.update.edit", "org.fedoraproject.prod.bodhi.update.status.testing.koji-build-group.build.complete", "org.fedoraproject.prod.coreos.build.state.change", "org.fedoraproject.prod.odcs.compose.state-changed"]
 openqa_amqp_scheduler_url: "{{ openqa_amqp_prod_url }}"
 
@@ -64,14 +64,14 @@ openqa_amqp_reporter_key: "{{ openqa_amqp_this_keyfile }}"
 openqa_amqp_reporter_url: "{{ openqa_amqp_this_url }}"
 
 # fedora-messaging resultsdb reporter settings
-openqa_amqp_resultsdb_reporter_queue: "{{ openqa_amqp_this_username }}_resultsdb_reporter"
+openqa_amqp_resultsdb_reporter_queue: "{{ openqa_amqp_prod_username }}_resultsdb_reporter{{ openqa_amqp_queue_suffix }}"
 openqa_amqp_resultsdb_reporter_routing_keys:
   - "org.fedoraproject.{{ deployment_type }}.openqa.job.done"
   - "org.fedoraproject.{{ deployment_type }}.openqa.job.create"
   - "org.fedoraproject.{{ deployment_type }}.openqa.job.restart"
 
 # fedora-messaging wiki reporter settings
-openqa_amqp_wiki_reporter_queue: "{{ openqa_amqp_this_username }}_wiki_reporter"
+openqa_amqp_wiki_reporter_queue: "{{ openqa_amqp_prod_username }}_wiki_reporter{{ openqa_amqp_queue_suffix }}"
 openqa_amqp_wiki_reporter_routing_keys: ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"]
 
 openqa_assetsize: 500

playbooks/groups/openqa.yml

@@ -133,6 +133,7 @@
     routing_keys: "{{ fedora_nightlies_amqp_routing_keys }}"
     vars:
       env: "production"
+      env_suffix: ""
     tags: ['rabbit']
     when: "fedora_nightlies_amqp_queue is defined"