From 080701af485ea06d25b5cd69e654c3df57d660b1 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 14 Jun 2019 12:12:00 -0700 Subject: [PATCH] Try to clean up openqa/rabbit var usage a bit now it works Signed-off-by: Adam Williamson --- inventory/group_vars/openqa | 2 -- inventory/group_vars/openqa_stg | 2 -- playbooks/groups/openqa.yml | 10 +++++++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/inventory/group_vars/openqa b/inventory/group_vars/openqa index 1bb944605f..9271534988 100644 --- a/inventory/group_vars/openqa +++ b/inventory/group_vars/openqa @@ -27,8 +27,6 @@ openqa_secret: "{{ prod_openqa_apisecret }}" # fedora-messaging bits, so let's make our own openqa_env_suffix: openqa_env: production -# we also need to override the rabbitmq server name... -rabbitmq_server: "rabbitmq01{{ openqa_env_suffix }}.phx2.fedoraproject.org" wikitcms_token: "{{ private }}/files/openidc/production/wikitcms.json" openqa_resultsdb_url: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v2.0/ diff --git a/inventory/group_vars/openqa_stg b/inventory/group_vars/openqa_stg index 981d329f53..7c3cecda39 100644 --- a/inventory/group_vars/openqa_stg +++ b/inventory/group_vars/openqa_stg @@ -43,8 +43,6 @@ openqa_secret: "{{ stg_openqa_apisecret }}" # fedora-messaging bits, so let's make our own openqa_env_suffix: .stg openqa_env: staging -# we also need to override the rabbitmq server name... -rabbitmq_server: "rabbitmq01{{ openqa_env_suffix }}.phx2.fedoraproject.org" # for now, we have the 'extra' arches (ppc64 and aarch64) on stg openqa_extraarches: true diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml index e293fa25d9..4218cc0fce 100644 --- a/playbooks/groups/openqa.yml +++ b/playbooks/groups/openqa.yml @@ -78,8 +78,8 @@ vars: # yes, even the staging scheduler listens to production, it # has to or else it wouldn't schedule any jobs - rabbitmq_server: "rabbitmq01.phx2.fedoraproject.org" env: "production" + env_suffix: "" tags: ['rabbit'] when: deployment_type == "stg" - role: rabbit/queue @@ -88,8 +88,10 @@ routing_keys: - "org.fedoraproject.{{ deployment_type }}.openqa.job.done" vars: - rabbitmq_server: "rabbitmq01{{ openqa_env_suffix }}.phx2.fedoraproject.org" + # for this role to work correctly we do need to look like a + # staging server env: "{{ openqa_env }}" + env_suffix: "{{ openqa_env_suffix }}" tags: ['rabbit'] when: deployment_type == "stg" - role: rabbit/queue @@ -98,8 +100,10 @@ routing_keys: - "org.fedoraproject.{{ deployment_type }}.openqa.job.done" vars: - rabbitmq_server: "rabbitmq01{{ openqa_env_suffix }}.phx2.fedoraproject.org" + # for this role to work correctly we do need to look like a + # staging server env: "{{ openqa_env }}" + env_suffix: "{{ openqa_env_suffix }}" tags: ['rabbit'] when: deployment_type == "stg" # nfs client setup