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

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

Browse source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-06-13 14:24:35 -07:00
parent 6ff690cb18
commit 848f81fa36
5 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/group_vars/openqa
View file

@ -26,6 +26,7 @@ openqa_secret: "{{ prod_openqa_apisecret }}"
# break some other plays, but we do need the env suffix for the # break some other plays, but we do need the env suffix for the
# fedora-messaging bits, so let's make our own # fedora-messaging bits, so let's make our own
openqa_env_suffix: openqa_env_suffix:
openqa_env: production
wikitcms_token: "{{ private }}/files/openidc/production/wikitcms.json" wikitcms_token: "{{ private }}/files/openidc/production/wikitcms.json"
openqa_resultsdb_url: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v2.0/ openqa_resultsdb_url: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v2.0/

1
inventory/group_vars/openqa_stg
View file

@ -42,6 +42,7 @@ openqa_secret: "{{ stg_openqa_apisecret }}"
# break some other plays, but we do need the env suffix for the # break some other plays, but we do need the env suffix for the
# fedora-messaging bits, so let's make our own # fedora-messaging bits, so let's make our own
openqa_env_suffix: .stg openqa_env_suffix: .stg
openqa_env: staging
# for now, we have the 'extra' arches (ppc64 and aarch64) on stg # for now, we have the 'extra' arches (ppc64 and aarch64) on stg
openqa_extraarches: true openqa_extraarches: true

1
inventory/group_vars/openqa_stg_workers
View file

@ -9,6 +9,7 @@ openqa_secret: "{{ stg_openqa_apisecret }}"
# break some other plays, but we do need the env suffix for the # break some other plays, but we do need the env suffix for the
# fedora-messaging bits, so let's make our own # fedora-messaging bits, so let's make our own
openqa_env_suffix: .stg openqa_env_suffix: .stg
openqa_env: staging
# These boxes are F30, so we need Python 3 ansible # These boxes are F30, so we need Python 3 ansible
ansible_python_interpreter: /usr/bin/python3 ansible_python_interpreter: /usr/bin/python3

1
inventory/group_vars/openqa_workers
View file

@ -9,6 +9,7 @@ openqa_secret: "{{ prod_openqa_apisecret }}"
# break some other plays, but we do need the env suffix for the # break some other plays, but we do need the env suffix for the
# fedora-messaging bits, so let's make our own # fedora-messaging bits, so let's make our own
openqa_env_suffix: openqa_env_suffix:
openqa_env: production
deployment_type: prod deployment_type: prod
freezes: false freezes: false

4
roles/openqa/dispatcher/tasks/main.yml
View file

@ -222,7 +222,7 @@
- name: Deploy the Fedora infra fedora-messaging cert - name: Deploy the Fedora infra fedora-messaging cert
copy: 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 dest: /etc/pki/fedora-messaging/openqa{{openqa_env_suffix}}-cert.pem
mode: 0644 mode: 0644
owner: root owner: root
@ -233,7 +233,7 @@
- name: Deploy the Fedora infra fedora-messaging key - name: Deploy the Fedora infra fedora-messaging key
copy: 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 dest: /etc/pki/fedora-messaging/openqa{{openqa_env_suffix}}-key.pem
mode: 0600 mode: 0600
owner: root owner: root