openqa: use openqa_env instead of env, just like env_suffix...

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

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/

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

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

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

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