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

moving resultsdb and resultsdb_frontend to separated endpoints for proxying

Browse source
This commit is contained in:
Tim Flink 2014-07-07 19:39:58 +00:00
parent 270871cdf0
commit 6f85dfb50c
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inventory/group_vars/resultsdb-dev
View file

@ -21,8 +21,8 @@ virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ m
resultsdb_db_host: db-qa01.qa.fedoraproject.org resultsdb_db_host: db-qa01.qa.fedoraproject.org
resultsdb_db_port: 5432 resultsdb_db_port: 5432
resultsdb_endpoint: '/resultsdb' resultsdb_endpoint: '/resultsdb_api'
resultsdb_fe_endpoint: '/' resultsdb_fe_endpoint: '/resultsdb'
resultsdb_db_name: resultsdb_dev resultsdb_db_name: resultsdb_dev
allowed_hosts: allowed_hosts:
- 10.5.124 - 10.5.124

3
inventory/group_vars/taskotron-dev
View file

@ -21,10 +21,11 @@ buildslave_dir: /home/buildslave/slave
master_dir: /home/buildmaster/master master_dir: /home/buildmaster/master
master_user: buildmaster master_user: buildmaster
external_hostname: taskotron.dev.fedoraproject.org external_hostname: taskotron.dev.fedoraproject.org
resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/api/v1.0 resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0
resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/ resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/
resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb/ resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb/
resultsdb_endpoint: resultsdb resultsdb_endpoint: resultsdb
resultsdb_api_endpoint: resultsdb_api
landingpage_title: "Taskotron Development" landingpage_title: "Taskotron Development"
deployment_type: dev deployment_type: dev
tcp_ports: [ 80, 443, "{{ buildslave_port }}" ] tcp_ports: [ 80, 443, "{{ buildslave_port }}" ]

2
inventory/group_vars/taskotron-dev-clients
View file

@ -2,7 +2,7 @@
lvm_size: 20000 lvm_size: 20000
slave_user: buildslave slave_user: buildslave
taskotron_fas_user: taskotron taskotron_fas_user: taskotron
resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/api/v1.0/ resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0/
bodhi_server: http://10.5.124.181/fakefedorainfra/bodhi/ bodhi_server: http://10.5.124.181/fakefedorainfra/bodhi/
kojihub_url: http://koji.fedoraproject.org/kojihub kojihub_url: http://koji.fedoraproject.org/kojihub
taskotron_master: http://taskotron-dev.fedoraproject.org/taskmaster/ taskotron_master: http://taskotron-dev.fedoraproject.org/taskmaster/

6
roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2
View file

@ -3,3 +3,9 @@
ProxyPassReverse {{ resultsdb_frontend_url }} ProxyPassReverse {{ resultsdb_frontend_url }}
RequestHeader add X-Script-Name /{{ resultsdb_endpoint }}/ RequestHeader add X-Script-Name /{{ resultsdb_endpoint }}/
</Location> </Location>
<Location /{{ resultsdb_api_endpoint }}/ >
ProxyPass {{ resultsdb_url }}
ProxyPassReverse {{ resultsdb_url }}
RequestHeader add X-Script-Name /{{ resultsdb_api_endpoint }}/
</Location>