From: Zack Cerza Date: Fri, 2 Oct 2015 22:35:20 +0000 (-0600) Subject: teuthology: Serve logs over http X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F148%2Fhead;p=ceph-cm-ansible.git teuthology: Serve logs over http Signed-off-by: Zack Cerza --- diff --git a/roles/teuthology/tasks/main.yml b/roles/teuthology/tasks/main.yml index a4bc92a5..08a121db 100644 --- a/roles/teuthology/tasks/main.yml +++ b/roles/teuthology/tasks/main.yml @@ -8,3 +8,12 @@ # Set up the different users that teuthology uses - include: setup_users.yml + +- name: Ship /etc/teuthology.yaml + template: + src: teuthology.yaml + dest: /etc/teuthology.yaml + mode: 0755 + +# Serve logs over HTTP +- include: setup_log_access.yml diff --git a/roles/teuthology/tasks/setup_log_access.yml b/roles/teuthology/tasks/setup_log_access.yml new file mode 100644 index 00000000..af84f798 --- /dev/null +++ b/roles/teuthology/tasks/setup_log_access.yml @@ -0,0 +1,29 @@ +--- +- name: Disable default nginx config + file: + name: /etc/nginx/sites-enabled/default + state: absent + +- name: Ship nginx config + template: + src: nginx.conf + dest: /etc/nginx/sites-available/test_logs + +- name: Enable nginx config + file: + src: /etc/nginx/sites-available/test_logs + dest: /etc/nginx/sites-enabled/test_logs + state: link + +- name: Disable apache httpd + service: + name: "{{ apache_service }}" + enabled: no + state: stopped + +- name: Enable nginx + service: + name: nginx + enabled: yes + state: reloaded + changed_when: false diff --git a/roles/teuthology/tasks/setup_users.yml b/roles/teuthology/tasks/setup_users.yml index 620a3062..f1b39d12 100644 --- a/roles/teuthology/tasks/setup_users.yml +++ b/roles/teuthology/tasks/setup_users.yml @@ -25,6 +25,8 @@ with_items: "{{ teuthology_users }}" register: bootstrap changed_when: bootstrap.stdout_lines[-1]|length > 60 + tags: + - repos - name: Add teuthology scripts to PATH lineinfile: diff --git a/roles/teuthology/templates/nginx.conf b/roles/teuthology/templates/nginx.conf new file mode 100644 index 00000000..ce7a6db8 --- /dev/null +++ b/roles/teuthology/templates/nginx.conf @@ -0,0 +1,8 @@ +# {{ ansible_managed }} +server { + allow all; + autoindex on; + server_name {{ inventory_hostname }}; + root /home/teuthworker/archive; + default_type text/plain; +} diff --git a/roles/teuthology/templates/teuthology.yaml b/roles/teuthology/templates/teuthology.yaml new file mode 100644 index 00000000..e5621463 --- /dev/null +++ b/roles/teuthology/templates/teuthology.yaml @@ -0,0 +1,16 @@ +# {{ ansible_managed }} +lock_server: {{ paddles_address }} +results_server: {{ paddles_address }} +results_ui_server: {{ pulpito_address }} +results_email: {{ teuthology_results_email|default('null') }} +results_sending_email: {{ teuthology_results_sending_email|default('null') }} +lab_domain: {{ lab_domain }} +default_machine_type: {{ teuthology_default_machine_type|default('null') }} +# Not yet configurable via ansible +archive_server: http://{{ inventory_hostname }}/ +archive_base: /home/teuthworker/archive +ceph_git_base_url: git://git.ceph.com/ +gitbuilder_host: gitbuilder.ceph.redhat.com +max_job_time: 129600 +queue_host: localhost +queue_port: 11300 diff --git a/roles/teuthology/vars/apt_systems.yml b/roles/teuthology/vars/apt_systems.yml index 5711d6fa..b5874e19 100644 --- a/roles/teuthology/vars/apt_systems.yml +++ b/roles/teuthology/vars/apt_systems.yml @@ -13,3 +13,7 @@ teuthology_extra_packages: - libffi-dev - libssl-dev - libyaml-dev + # The following are requirements for serving teuthology logs + - nginx + +apache_service: apache2