windmill/ansible-role-zuul
Code Issues Proposed changes

Register the results of file changes

Browse Source 
The idea here is to expose information to users to allow them to make
decisions, for example restarting a service.

Change-Id: I815564f9708a51ce13ea0397dd991aebbcad430e
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-10-04 12:50:26 -04:00
parent 188383e8d0
commit a196040868
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
4 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
handlers/main.yaml
View File

@ -19,7 +19,7 @@
state: reloaded state: reloaded
when: zuul_service_zuul_launcher_manage and when: zuul_service_zuul_launcher_manage and
zuul_service_zuul_launcher_state == "started" and not zuul_service_zuul_launcher_state == "started" and not
__zuul_launcher_service.changed zuul_service_zuul_launcher.changed
- name: Reload zuul-merger - name: Reload zuul-merger
become: yes become: yes
@ -28,7 +28,7 @@
state: reloaded state: reloaded
when: zuul_service_zuul_merger_manage and when: zuul_service_zuul_merger_manage and
zuul_service_zuul_merger_state == "started" and not zuul_service_zuul_merger_state == "started" and not
__zuul_merger_service.changed zuul_service_zuul_merger.changed
- name: Reload zuul-server - name: Reload zuul-server
become: yes become: yes
@ -37,4 +37,4 @@
state: reloaded state: reloaded
when: zuul_service_zuul_server_manage and when: zuul_service_zuul_server_manage and
zuul_service_zuul_server_state == "started" and not zuul_service_zuul_server_state == "started" and not
__zuul_server_service.changed zuul_service_zuul_server.changed

6
tasks/config.yaml
View File

@ -31,6 +31,7 @@
mode: "{{ zuul_file_gearman_logging_conf_mode }}" mode: "{{ zuul_file_gearman_logging_conf_mode }}"
owner: "{{ zuul_file_gearman_logging_conf_owner }}" owner: "{{ zuul_file_gearman_logging_conf_owner }}"
src: "{{ zuul_file_gearman_logging_conf_src }}" src: "{{ zuul_file_gearman_logging_conf_src }}"
register: zuul_file_gearman_logging_conf
notify: Reload zuul-server notify: Reload zuul-server
- name: Copy launcher logging file. - name: Copy launcher logging file.
@ -41,6 +42,7 @@
mode: "{{ zuul_file_launcher_logging_conf_mode }}" mode: "{{ zuul_file_launcher_logging_conf_mode }}"
owner: "{{ zuul_file_launcher_logging_conf_owner }}" owner: "{{ zuul_file_launcher_logging_conf_owner }}"
src: "{{ zuul_file_launcher_logging_conf_src }}" src: "{{ zuul_file_launcher_logging_conf_src }}"
register: zuul_file_launcher_logging_conf
notify: Reload zuul-launcher notify: Reload zuul-launcher
- name: Copy merger logging file. - name: Copy merger logging file.
@ -51,6 +53,7 @@
mode: "{{ zuul_file_merger_logging_conf_mode }}" mode: "{{ zuul_file_merger_logging_conf_mode }}"
owner: "{{ zuul_file_merger_logging_conf_owner }}" owner: "{{ zuul_file_merger_logging_conf_owner }}"
src: "{{ zuul_file_merger_logging_conf_src }}" src: "{{ zuul_file_merger_logging_conf_src }}"
register: zuul_file_merger_logging_conf
notify: Reload zuul-merger notify: Reload zuul-merger
- name: Copy server logging file. - name: Copy server logging file.
@ -61,6 +64,7 @@
mode: "{{ zuul_file_server_logging_conf_mode }}" mode: "{{ zuul_file_server_logging_conf_mode }}"
owner: "{{ zuul_file_server_logging_conf_owner }}" owner: "{{ zuul_file_server_logging_conf_owner }}"
src: "{{ zuul_file_server_logging_conf_src }}" src: "{{ zuul_file_server_logging_conf_src }}"
register: zuul_file_server_logging_conf
notify: Reload zuul-server notify: Reload zuul-server
- name: Copy layout configuration. - name: Copy layout configuration.
@ -71,6 +75,7 @@
mode: "{{ zuul_file_layout_mode }}" mode: "{{ zuul_file_layout_mode }}"
owner: "{{ zuul_file_layout_owner }}" owner: "{{ zuul_file_layout_owner }}"
src: "{{ zuul_file_layout_src }}" src: "{{ zuul_file_layout_src }}"
register: zuul_file_layout
notify: Reload zuul-server notify: Reload zuul-server
- name: Copy zuul configuration. - name: Copy zuul configuration.
@ -81,6 +86,7 @@
mode: "{{ zuul_file_zuul_conf_mode }}" mode: "{{ zuul_file_zuul_conf_mode }}"
owner: "{{ zuul_file_zuul_conf_owner }}" owner: "{{ zuul_file_zuul_conf_owner }}"
src: "{{ zuul_file_zuul_conf_src }}" src: "{{ zuul_file_zuul_conf_src }}"
register: zuul_file_zuul_conf
notify: notify:
- Reload zuul-launcher - Reload zuul-launcher
- Reload zuul-merger - Reload zuul-merger

12
tasks/service.yaml
View File

@ -110,6 +110,7 @@
mode: "{{ zuul_file_zuul_launcher_service_mode }}" mode: "{{ zuul_file_zuul_launcher_service_mode }}"
owner: "{{ zuul_file_zuul_launcher_service_owner }}" owner: "{{ zuul_file_zuul_launcher_service_owner }}"
src: "{{ zuul_file_zuul_launcher_service_src }}" src: "{{ zuul_file_zuul_launcher_service_src }}"
register: zuul_file_zuul_launcher_service
- name: Copy zuul-launcher service config into place. - name: Copy zuul-launcher service config into place.
become: yes become: yes
@ -119,6 +120,7 @@
mode: "{{ zuul_file_zuul_launcher_service_config_mode }}" mode: "{{ zuul_file_zuul_launcher_service_config_mode }}"
owner: "{{ zuul_file_zuul_launcher_service_config_owner }}" owner: "{{ zuul_file_zuul_launcher_service_config_owner }}"
src: "{{ zuul_file_zuul_launcher_service_config_src }}" src: "{{ zuul_file_zuul_launcher_service_config_src }}"
register: zuul_file_zuul_launcher_service_config
- name: Copy zuul-merger service into place. - name: Copy zuul-merger service into place.
become: yes become: yes
@ -128,6 +130,7 @@
mode: "{{ zuul_file_zuul_merger_service_mode }}" mode: "{{ zuul_file_zuul_merger_service_mode }}"
owner: "{{ zuul_file_zuul_merger_service_owner }}" owner: "{{ zuul_file_zuul_merger_service_owner }}"
src: "{{ zuul_file_zuul_merger_service_src }}" src: "{{ zuul_file_zuul_merger_service_src }}"
register: zuul_file_zuul_merger_service
- name: Copy zuul-merger service config into place. - name: Copy zuul-merger service config into place.
become: yes become: yes
@ -137,6 +140,7 @@
mode: "{{ zuul_file_zuul_merger_service_config_mode }}" mode: "{{ zuul_file_zuul_merger_service_config_mode }}"
owner: "{{ zuul_file_zuul_merger_service_config_owner }}" owner: "{{ zuul_file_zuul_merger_service_config_owner }}"
src: "{{ zuul_file_zuul_merger_service_config_src }}" src: "{{ zuul_file_zuul_merger_service_config_src }}"
register: zuul_file_zuul_merger_service_config
- name: Copy zuul-server service into place. - name: Copy zuul-server service into place.
become: yes become: yes
@ -146,6 +150,7 @@
mode: "{{ zuul_file_zuul_server_service_mode }}" mode: "{{ zuul_file_zuul_server_service_mode }}"
owner: "{{ zuul_file_zuul_server_service_owner }}" owner: "{{ zuul_file_zuul_server_service_owner }}"
src: "{{ zuul_file_zuul_server_service_src }}" src: "{{ zuul_file_zuul_server_service_src }}"
register: zuul_file_zuul_server_service
- name: Copy zuul-server service config into place. - name: Copy zuul-server service config into place.
become: yes become: yes
@ -155,6 +160,7 @@
mode: "{{ zuul_file_zuul_server_service_config_mode }}" mode: "{{ zuul_file_zuul_server_service_config_mode }}"
owner: "{{ zuul_file_zuul_server_service_config_owner }}" owner: "{{ zuul_file_zuul_server_service_config_owner }}"
src: "{{ zuul_file_zuul_server_service_config_src }}" src: "{{ zuul_file_zuul_server_service_config_src }}"
register: zuul_file_zuul_server_service_config
- name: Enable zuul-launcher service. - name: Enable zuul-launcher service.
become: yes become: yes
@ -162,7 +168,7 @@
enabled: "{{ zuul_service_zuul_launcher_enabled }}" enabled: "{{ zuul_service_zuul_launcher_enabled }}"
name: "{{ zuul_service_zuul_launcher_name }}" name: "{{ zuul_service_zuul_launcher_name }}"
state: "{{ zuul_service_zuul_launcher_state }}" state: "{{ zuul_service_zuul_launcher_state }}"
register: __zuul_launcher_service register: zuul_service_zuul_launcher
when: zuul_service_zuul_launcher_manage when: zuul_service_zuul_launcher_manage
- name: Enable zuul-merger service. - name: Enable zuul-merger service.
@ -171,7 +177,7 @@
enabled: "{{ zuul_service_zuul_merger_enabled }}" enabled: "{{ zuul_service_zuul_merger_enabled }}"
name: "{{ zuul_service_zuul_merger_name }}" name: "{{ zuul_service_zuul_merger_name }}"
state: "{{ zuul_service_zuul_merger_state }}" state: "{{ zuul_service_zuul_merger_state }}"
register: __zuul_merger_service register: zuul_service_zuul_merger
when: zuul_service_zuul_merger_manage when: zuul_service_zuul_merger_manage
- name: Enable zuul-server service. - name: Enable zuul-server service.
@ -180,5 +186,5 @@
enabled: "{{ zuul_service_zuul_server_enabled }}" enabled: "{{ zuul_service_zuul_server_enabled }}"
name: "{{ zuul_service_zuul_server_name }}" name: "{{ zuul_service_zuul_server_name }}"
state: "{{ zuul_service_zuul_server_state }}" state: "{{ zuul_service_zuul_server_state }}"
register: __zuul_server_service register: zuul_service_zuul_server
when: zuul_service_zuul_server_manage when: zuul_service_zuul_server_manage

19
tests/test.yaml
View File

@ -27,6 +27,25 @@
- "{{ rolename }}" - "{{ rolename }}"
post_tasks: post_tasks:
- name: Assert results are registered.
assert:
that:
- zuul_file_gearman_logging_conf
- zuul_file_launcher_logging_conf
- zuul_file_merger_logging_conf
- zuul_file_server_logging_conf
- zuul_file_layout
- zuul_file_zuul_conf
- zuul_file_zuul_launcher_service
- zuul_file_zuul_launcher_service_config
- zuul_file_zuul_merger_service
- zuul_file_zuul_merger_service_config
- zuul_file_zuul_server_service
- zuul_file_zuul_server_service_config
- zuul_service_zuul_launcher
- zuul_service_zuul_merger
- zuul_service_zuul_server
- name: Ensure zuul_user_name is zuul. - name: Ensure zuul_user_name is zuul.
shell: /usr/bin/getent passwd zuul shell: /usr/bin/getent passwd zuul
tags: skip_ansible_lint tags: skip_ansible_lint