From b797671b6af024a6936e9c10b9cdf7114c9fdcd3 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Thu, 3 Jul 2014 02:00:26 +0000 Subject: [PATCH] adding taskotron-proxy role for dev --- inventory/group_vars/taskotron-dev | 1 + playbooks/groups/taskotron-dev.yml | 1 + roles/taskotron/taskotron-proxy/tasks/main.yml | 17 +++++++++++++++++ .../taskotron-proxy/templates/resultsdb.conf.j2 | 4 ++++ 4 files changed, 23 insertions(+) create mode 100644 roles/taskotron/taskotron-proxy/tasks/main.yml create mode 100644 roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index 310b118b08..2268222027 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -23,5 +23,6 @@ master_user: buildmaster external_hostname: taskotron.dev.fedoraproject.org resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/api/v1.0 resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/ +resultsdb_endpoint: resultsdb landingpage_title: "Taskotron Development" deployment_type: dev diff --git a/playbooks/groups/taskotron-dev.yml b/playbooks/groups/taskotron-dev.yml index 7f825c66a2..fbfdd8d5ea 100644 --- a/playbooks/groups/taskotron-dev.yml +++ b/playbooks/groups/taskotron-dev.yml @@ -69,6 +69,7 @@ - { role: taskotron/buildmaster-configure, tags: ['buildmasterconfig'] } - { role: taskotron/taskotron-trigger, tags: ['trigger'] } - { role: taskotron/taskotron-frontend, tags: ['frontend'] } + - { role: taskotron/taskotron-proxy, tags: ['taskotronproxy'] } handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/roles/taskotron/taskotron-proxy/tasks/main.yml b/roles/taskotron/taskotron-proxy/tasks/main.yml new file mode 100644 index 0000000000..e102376c54 --- /dev/null +++ b/roles/taskotron/taskotron-proxy/tasks/main.yml @@ -0,0 +1,17 @@ +# this was designed to be used in dev where there is no global proxy +# this way, we can get away with a single ip and ssl cert instead of +# one for taskotron and one for resultsdb. The url scheme also stays +# closer to stg/prod + +- name: ensure packages required for proxying are installedc + action: yum name={{ item }} state=latest + with_items: + - libsemanage-python + +- name: allow httpd tcp connections with selinux + seboolean: name=httpd_can_network_connect state=true persistent=yes + +- name: copy resultsdb proxy httpd config + template: src=resultsdb.conf.j2 dest=/etc/httpd/conf.d/resultsdb.conf owner=root group=root + notify: + - restart httpd diff --git a/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 b/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 new file mode 100644 index 0000000000..8a22c6f520 --- /dev/null +++ b/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 @@ -0,0 +1,4 @@ + + ProxyPass http://{{ resultsdb_frontend_url }}/ + ProxyPassReverse http://{{ resultsdb_frontend_url }}/ +