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

removing complexity from taskotron master config

Browse source
This commit is contained in:
Tim Flink 2016-01-21 15:52:54 +00:00
parent a5482ba90e
commit ef903862e8
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/taskotron-stg
View file

@ -60,6 +60,8 @@ cgit_root_title: "Taskotron Stg Server Git Mirror"
buildmaster_db_host: db-qa01.qa.fedoraproject.org
buildmaster_db_name: buildmaster_stg
buildmaster_db_user: "{{ stg_buildmaster_db_user }}"
buildmaster_db_password: "{{ stg_buildmaster_db_password }}"
buildmaster_dir: /srv/buildmaster/master
buildmaster_endpoint: taskmaster
buildmaster_home: /srv/buildmaster

5
roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
View file

@ -402,12 +402,9 @@ c['buildbotURL'] = "http://{{ external_hostname }}/{{buildmaster_endpoint}}/"
c['db'] = {
# This specifies what database buildbot uses to store its state. You can leave
# this at its default for all but the largest installations.
{% if deployment_type == 'dev' %}
{% if deployment_type in ['dev', 'stg'] %}
'db_url' : "postgresql://{{ buildmaster_db_user }}:{{ buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}",
{% endif %}
{% if deployment_type == 'stg' %}
'db_url' : "postgresql://{{ stg_buildmaster_db_user }}:{{ stg_buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}",
{% endif %}
{% if deployment_type == 'prod' %}
'db_url' : "postgresql://{{ prod_buildmaster_db_user }}:{{ prod_buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}",
{% endif %}