From a19604086846ae3c7e4df60d3205168dc03ecc9d Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 4 Oct 2016 12:50:26 -0400 Subject: [PATCH] Register the results of file changes 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 --- handlers/main.yaml | 6 +++--- tasks/config.yaml | 6 ++++++ tasks/service.yaml | 12 +++++++++--- tests/test.yaml | 19 +++++++++++++++++++ 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/handlers/main.yaml b/handlers/main.yaml index e6908dd..e3c8c16 100644 --- a/handlers/main.yaml +++ b/handlers/main.yaml @@ -19,7 +19,7 @@ state: reloaded when: zuul_service_zuul_launcher_manage and zuul_service_zuul_launcher_state == "started" and not - __zuul_launcher_service.changed + zuul_service_zuul_launcher.changed - name: Reload zuul-merger become: yes @@ -28,7 +28,7 @@ state: reloaded when: zuul_service_zuul_merger_manage and zuul_service_zuul_merger_state == "started" and not - __zuul_merger_service.changed + zuul_service_zuul_merger.changed - name: Reload zuul-server become: yes @@ -37,4 +37,4 @@ state: reloaded when: zuul_service_zuul_server_manage and zuul_service_zuul_server_state == "started" and not - __zuul_server_service.changed + zuul_service_zuul_server.changed diff --git a/tasks/config.yaml b/tasks/config.yaml index 280a6e4..ba43a98 100644 --- a/tasks/config.yaml +++ b/tasks/config.yaml @@ -31,6 +31,7 @@ mode: "{{ zuul_file_gearman_logging_conf_mode }}" owner: "{{ zuul_file_gearman_logging_conf_owner }}" src: "{{ zuul_file_gearman_logging_conf_src }}" + register: zuul_file_gearman_logging_conf notify: Reload zuul-server - name: Copy launcher logging file. @@ -41,6 +42,7 @@ mode: "{{ zuul_file_launcher_logging_conf_mode }}" owner: "{{ zuul_file_launcher_logging_conf_owner }}" src: "{{ zuul_file_launcher_logging_conf_src }}" + register: zuul_file_launcher_logging_conf notify: Reload zuul-launcher - name: Copy merger logging file. @@ -51,6 +53,7 @@ mode: "{{ zuul_file_merger_logging_conf_mode }}" owner: "{{ zuul_file_merger_logging_conf_owner }}" src: "{{ zuul_file_merger_logging_conf_src }}" + register: zuul_file_merger_logging_conf notify: Reload zuul-merger - name: Copy server logging file. @@ -61,6 +64,7 @@ mode: "{{ zuul_file_server_logging_conf_mode }}" owner: "{{ zuul_file_server_logging_conf_owner }}" src: "{{ zuul_file_server_logging_conf_src }}" + register: zuul_file_server_logging_conf notify: Reload zuul-server - name: Copy layout configuration. @@ -71,6 +75,7 @@ mode: "{{ zuul_file_layout_mode }}" owner: "{{ zuul_file_layout_owner }}" src: "{{ zuul_file_layout_src }}" + register: zuul_file_layout notify: Reload zuul-server - name: Copy zuul configuration. @@ -81,6 +86,7 @@ mode: "{{ zuul_file_zuul_conf_mode }}" owner: "{{ zuul_file_zuul_conf_owner }}" src: "{{ zuul_file_zuul_conf_src }}" + register: zuul_file_zuul_conf notify: - Reload zuul-launcher - Reload zuul-merger diff --git a/tasks/service.yaml b/tasks/service.yaml index 270d66b..eda4783 100644 --- a/tasks/service.yaml +++ b/tasks/service.yaml @@ -110,6 +110,7 @@ mode: "{{ zuul_file_zuul_launcher_service_mode }}" owner: "{{ zuul_file_zuul_launcher_service_owner }}" src: "{{ zuul_file_zuul_launcher_service_src }}" + register: zuul_file_zuul_launcher_service - name: Copy zuul-launcher service config into place. become: yes @@ -119,6 +120,7 @@ mode: "{{ zuul_file_zuul_launcher_service_config_mode }}" owner: "{{ zuul_file_zuul_launcher_service_config_owner }}" src: "{{ zuul_file_zuul_launcher_service_config_src }}" + register: zuul_file_zuul_launcher_service_config - name: Copy zuul-merger service into place. become: yes @@ -128,6 +130,7 @@ mode: "{{ zuul_file_zuul_merger_service_mode }}" owner: "{{ zuul_file_zuul_merger_service_owner }}" src: "{{ zuul_file_zuul_merger_service_src }}" + register: zuul_file_zuul_merger_service - name: Copy zuul-merger service config into place. become: yes @@ -137,6 +140,7 @@ mode: "{{ zuul_file_zuul_merger_service_config_mode }}" owner: "{{ zuul_file_zuul_merger_service_config_owner }}" src: "{{ zuul_file_zuul_merger_service_config_src }}" + register: zuul_file_zuul_merger_service_config - name: Copy zuul-server service into place. become: yes @@ -146,6 +150,7 @@ mode: "{{ zuul_file_zuul_server_service_mode }}" owner: "{{ zuul_file_zuul_server_service_owner }}" src: "{{ zuul_file_zuul_server_service_src }}" + register: zuul_file_zuul_server_service - name: Copy zuul-server service config into place. become: yes @@ -155,6 +160,7 @@ mode: "{{ zuul_file_zuul_server_service_config_mode }}" owner: "{{ zuul_file_zuul_server_service_config_owner }}" src: "{{ zuul_file_zuul_server_service_config_src }}" + register: zuul_file_zuul_server_service_config - name: Enable zuul-launcher service. become: yes @@ -162,7 +168,7 @@ enabled: "{{ zuul_service_zuul_launcher_enabled }}" name: "{{ zuul_service_zuul_launcher_name }}" state: "{{ zuul_service_zuul_launcher_state }}" - register: __zuul_launcher_service + register: zuul_service_zuul_launcher when: zuul_service_zuul_launcher_manage - name: Enable zuul-merger service. @@ -171,7 +177,7 @@ enabled: "{{ zuul_service_zuul_merger_enabled }}" name: "{{ zuul_service_zuul_merger_name }}" state: "{{ zuul_service_zuul_merger_state }}" - register: __zuul_merger_service + register: zuul_service_zuul_merger when: zuul_service_zuul_merger_manage - name: Enable zuul-server service. @@ -180,5 +186,5 @@ enabled: "{{ zuul_service_zuul_server_enabled }}" name: "{{ zuul_service_zuul_server_name }}" state: "{{ zuul_service_zuul_server_state }}" - register: __zuul_server_service + register: zuul_service_zuul_server when: zuul_service_zuul_server_manage diff --git a/tests/test.yaml b/tests/test.yaml index cb3292b..78bf749 100644 --- a/tests/test.yaml +++ b/tests/test.yaml @@ -27,6 +27,25 @@ - "{{ rolename }}" 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. shell: /usr/bin/getent passwd zuul tags: skip_ansible_lint