From 848f81fa365b3883b8e430892067900ba21a310c Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 13 Jun 2019 14:24:35 -0700
Subject: [PATCH] openqa: use openqa_env instead of env, just like
 env_suffix...

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 inventory/group_vars/openqa             | 1 +
 inventory/group_vars/openqa_stg         | 1 +
 inventory/group_vars/openqa_stg_workers | 1 +
 inventory/group_vars/openqa_workers     | 1 +
 roles/openqa/dispatcher/tasks/main.yml  | 4 ++--
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/inventory/group_vars/openqa b/inventory/group_vars/openqa
index ad62f39249..9271534988 100644
--- a/inventory/group_vars/openqa
+++ b/inventory/group_vars/openqa
@@ -26,6 +26,7 @@ openqa_secret: "{{ prod_openqa_apisecret }}"
 # break some other plays, but we do need the env suffix for the
 # fedora-messaging bits, so let's make our own
 openqa_env_suffix:
+openqa_env: production
 
 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 dfa7247a70..01834c355e 100644
--- a/inventory/group_vars/openqa_stg
+++ b/inventory/group_vars/openqa_stg
@@ -42,6 +42,7 @@ openqa_secret: "{{ stg_openqa_apisecret }}"
 # break some other plays, but we do need the env suffix for the
 # fedora-messaging bits, so let's make our own
 openqa_env_suffix: .stg
+openqa_env: staging
 
 # for now, we have the 'extra' arches (ppc64 and aarch64) on stg
 openqa_extraarches: true
diff --git a/inventory/group_vars/openqa_stg_workers b/inventory/group_vars/openqa_stg_workers
index dd6255daec..bc989ab343 100644
--- a/inventory/group_vars/openqa_stg_workers
+++ b/inventory/group_vars/openqa_stg_workers
@@ -9,6 +9,7 @@ openqa_secret: "{{ stg_openqa_apisecret }}"
 # break some other plays, but we do need the env suffix for the
 # fedora-messaging bits, so let's make our own
 openqa_env_suffix: .stg
+openqa_env: staging
 
 # These boxes are F30, so we need Python 3 ansible
 ansible_python_interpreter: /usr/bin/python3
diff --git a/inventory/group_vars/openqa_workers b/inventory/group_vars/openqa_workers
index 38236bc96a..97b9993a01 100644
--- a/inventory/group_vars/openqa_workers
+++ b/inventory/group_vars/openqa_workers
@@ -9,6 +9,7 @@ openqa_secret: "{{ prod_openqa_apisecret }}"
 # break some other plays, but we do need the env suffix for the
 # fedora-messaging bits, so let's make our own
 openqa_env_suffix:
+openqa_env: production
 
 deployment_type: prod
 freezes: false
diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml
index 8f0d63a063..4ad2feb8bc 100644
--- a/roles/openqa/dispatcher/tasks/main.yml
+++ b/roles/openqa/dispatcher/tasks/main.yml
@@ -222,7 +222,7 @@
 
 - name: Deploy the Fedora infra fedora-messaging cert
   copy:
-    src: "{{ private }}/files/rabbitmq/{{env}}/pki/issued/openqa{{openqa_env_suffix}}.crt"
+    src: "{{ private }}/files/rabbitmq/{{openqa_env}}/pki/issued/openqa{{openqa_env_suffix}}.crt"
     dest: /etc/pki/fedora-messaging/openqa{{openqa_env_suffix}}-cert.pem
     mode: 0644
     owner: root
@@ -233,7 +233,7 @@
 
 - name: Deploy the Fedora infra fedora-messaging key
   copy:
-    src: "{{ private }}/files/rabbitmq/{{env}}/pki/private/openqa{{openqa_env_suffix}}.key"
+    src: "{{ private }}/files/rabbitmq/{{openqa_env}}/pki/private/openqa{{openqa_env_suffix}}.key"
     dest: /etc/pki/fedora-messaging/openqa{{openqa_env_suffix}}-key.pem
     mode: 0600
     owner: root