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

openqa: consolidate some server settings to a common group

Browse source 
There are several variables we set to the same value for openQA
prod and staging servers. Instead of duplicating these between
the openqa and openqa_stg groups, let's invent an openqa_common
and put them in there, and add both servers to it.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-06-14 12:41:58 -07:00
parent 0b50324342
commit 054bdeaf6a
4 changed files with 62 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

52
inventory/group_vars/openqa
View file

@ -3,20 +3,10 @@ virt_install_command: "{{ virt_install_command_one_nic }} --cpu=host-passthrough
external_hostname: openqa.fedoraproject.org
openqa_static_uid: 601
openqa_hostname: localhost
openqa_email: adamwill@fedoraproject.org
openqa_nickname: adamwill
openqa_fullname: Adam Williamson
openqa_userid: http://adamwill.id.fedoraproject.org/
openqa_dbname: openqa
openqa_dbhost: db-qa03.qa.fedoraproject.org
openqa_dbuser: openqa
openqa_dbpassword: "{{ prod_openqa_dbpassword }}"
openqa_assetsize: 500
openqa_assetsize_updates: 100
openqa_key: "{{ prod_openqa_apikey }}"
openqa_secret: "{{ prod_openqa_apisecret }}"
@ -44,45 +34,3 @@ checkcompose_greenwaveurl: https://greenwave-web-greenwave.app.os.fedoraproject.
deployment_type: prod
freezes: false
# http and NFS
tcp_ports: [80, 2049]
# These people get told when something goes wrong.
fedmsg_error_recipients:
- adamwill@fedoraproject.org
- lruzicka@fedoraproject.org
# These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs:
- service: shell
owner: root
group: sysadmin
can_send:
- logger.log
- service: openqa
owner: root
group: geekotest
can_send:
- openqa.comment.create
- openqa.comment.update
- openqa.comment.delete
- openqa.job.create
- openqa.job.delete
- openqa.job.cancel
- openqa.job.duplicate
- openqa.job.restart
- openqa.jobs.restart
- openqa.job.update.result
- openqa.job.done
- service: ci
owner: root
group: geekotest
can_send:
- ci.productmd-compose.test.queued
- ci.productmd-compose.test.running
- ci.productmd-compose.test.complete
- ci.productmd-compose.test.error
# we need this to log with fedmsg-logger
fedmsg_active: True

57
inventory/group_vars/openqa_common Normal file
View file

@ -0,0 +1,57 @@
# here we keep variables that are the same between prod and staging
# openQA servers. these are mostly things that are set as variables
# in the plays so we can change them over time and also so the plays
# can be used for non-infra deployments.
openqa_static_uid: 601
openqa_hostname: localhost
openqa_email: adamwill@fedoraproject.org
openqa_nickname: adamwill
openqa_fullname: Adam Williamson
openqa_userid: http://adamwill.id.fedoraproject.org/
openqa_assetsize: 500
openqa_assetsize_updates: 100
# http and NFS
tcp_ports: [80, 2049]
# These people get told when something goes wrong.
fedmsg_error_recipients:
- adamwill@fedoraproject.org
- lruzicka@fedoraproject.org
# These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs:
- service: shell
owner: root
group: sysadmin
can_send:
- logger.log
- service: openqa
owner: root
group: geekotest
can_send:
- openqa.comment.create
- openqa.comment.update
- openqa.comment.delete
- openqa.job.create
- openqa.job.delete
- openqa.job.cancel
- openqa.job.duplicate
- openqa.job.restart
- openqa.jobs.restart
- openqa.job.update.result
- openqa.job.done
- service: ci
owner: root
group: geekotest
can_send:
- ci.productmd-compose.test.queued
- ci.productmd-compose.test.running
- ci.productmd-compose.test.complete
- ci.productmd-compose.test.error
# we need this to log with fedmsg-logger
fedmsg_active: True

52
inventory/group_vars/openqa_stg
View file

@ -17,22 +17,12 @@ ansible_python_interpreter: /usr/bin/python3
external_hostname: openqa.stg.fedoraproject.org
openqa_static_uid: 601
openqa_hostname: localhost
openqa_email: adamwill@fedoraproject.org
openqa_nickname: adamwill
openqa_fullname: Adam Williamson
openqa_userid: http://adamwill.id.fedoraproject.org/
openqa_dbname: openqa-stg
openqa_dbhost: db-qa03.qa.fedoraproject.org
openqa_dbuser: openqastg
openqa_dbpassword: "{{ stg_openqa_dbpassword }}"
openqa_assetsize: 500
openqa_assetsize_ppc: 150
openqa_assetsize_aarch64: 150
openqa_assetsize_updates: 100
openqa_key: "{{ stg_openqa_apikey }}"
openqa_secret: "{{ stg_openqa_apisecret }}"
@ -62,47 +52,5 @@ checkcompose_greenwaveurl: https://greenwave-web-greenwave.app.os.stg.fedoraproj
deployment_type: stg
freezes: false
# http and NFS
tcp_ports: [80, 2049]
# These people get told when something goes wrong.
fedmsg_error_recipients:
- adamwill@fedoraproject.org
- lruzicka@fedoraproject.org
# These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs:
- service: shell
owner: root
group: sysadmin
can_send:
- logger.log
- service: openqa
owner: root
group: geekotest
can_send:
- openqa.comment.create
- openqa.comment.update
- openqa.comment.delete
- openqa.job.create
- openqa.job.delete
- openqa.job.cancel
- openqa.job.duplicate
- openqa.job.restart
- openqa.jobs.restart
- openqa.job.update.result
- openqa.job.done
- service: ci
owner: root
group: geekotest
can_send:
- ci.productmd-compose.test.queued
- ci.productmd-compose.test.running
- ci.productmd-compose.test.complete
- ci.productmd-compose.test.error
# we need this to log with fedmsg-logger
fedmsg_active: True
# makes sure it sends stg not prod fedmsgs
fedmsg_env: stg

5
inventory/inventory
View file

@ -572,6 +572,11 @@ odcs_backend_stg
odcs_frontend
odcs_backend
# common group for variables shared between prod and stg servers
[openqa_common]
openqa01.qa.fedoraproject.org
openqa-stg01.qa.fedoraproject.org
[openqa]
openqa01.qa.fedoraproject.org