From 242a1c0460ff7c4e86a1287a8514a4ee851d7145 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Sun, 28 Aug 2016 15:51:07 -0400 Subject: [PATCH] Per service configurations It is now possible to make configuration changes per service. Change-Id: Ia59daa9859c22e4ff5e601528a63331d2eef93cf Signed-off-by: Paul Belanger --- defaults/main.yaml | 12 +- files/etc/default/{zuul => zuul-launcher} | 0 .../{sysconfig/zuul => default/zuul-merger} | 0 files/etc/default/zuul-server | 3 + files/etc/sysconfig/zuul-launcher | 3 + files/etc/sysconfig/zuul-merger | 3 + files/etc/sysconfig/zuul-server | 3 + .../etc/systemd/system/zuul-launcher.service | 2 +- files/etc/systemd/system/zuul-merger.service | 2 +- files/etc/systemd/system/zuul-server.service | 2 +- tasks/service.yaml | 94 ++++++++++---- tests/test.yaml | 118 ++++++++++++++---- vars/Debian.yaml | 16 ++- vars/RedHat.yaml | 16 ++- 14 files changed, 210 insertions(+), 64 deletions(-) rename files/etc/default/{zuul => zuul-launcher} (100%) rename files/etc/{sysconfig/zuul => default/zuul-merger} (100%) create mode 100644 files/etc/default/zuul-server create mode 100644 files/etc/sysconfig/zuul-launcher create mode 100644 files/etc/sysconfig/zuul-merger create mode 100644 files/etc/sysconfig/zuul-server diff --git a/defaults/main.yaml b/defaults/main.yaml index cc06884..454c1f8 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -73,18 +73,24 @@ zuul_pip_name: zuul #zuul_pip_virtualenv: # tasks/service.yaml -zuul_file_zuul_service_config_group: root -zuul_file_zuul_service_config_owner: root - zuul_file_zuul_launcher_service_group: root zuul_file_zuul_launcher_service_owner: root +zuul_file_zuul_launcher_service_config_group: root +zuul_file_zuul_launcher_service_config_owner: root + zuul_file_zuul_merger_service_group: root zuul_file_zuul_merger_service_owner: root +zuul_file_zuul_merger_service_config_group: root +zuul_file_zuul_merger_service_config_owner: root + zuul_file_zuul_server_service_group: root zuul_file_zuul_server_service_owner: root +zuul_file_zuul_server_service_config_group: root +zuul_file_zuul_server_service_config_owner: root + zuul_service_zuul_launcher_enabled: yes zuul_service_zuul_launcher_manage: true zuul_service_zuul_launcher_name: zuul-launcher diff --git a/files/etc/default/zuul b/files/etc/default/zuul-launcher similarity index 100% rename from files/etc/default/zuul rename to files/etc/default/zuul-launcher diff --git a/files/etc/sysconfig/zuul b/files/etc/default/zuul-merger similarity index 100% rename from files/etc/sysconfig/zuul rename to files/etc/default/zuul-merger diff --git a/files/etc/default/zuul-server b/files/etc/default/zuul-server new file mode 100644 index 0000000..602ac8e --- /dev/null +++ b/files/etc/default/zuul-server @@ -0,0 +1,3 @@ +# This file is generated by Ansible +# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN +# diff --git a/files/etc/sysconfig/zuul-launcher b/files/etc/sysconfig/zuul-launcher new file mode 100644 index 0000000..602ac8e --- /dev/null +++ b/files/etc/sysconfig/zuul-launcher @@ -0,0 +1,3 @@ +# This file is generated by Ansible +# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN +# diff --git a/files/etc/sysconfig/zuul-merger b/files/etc/sysconfig/zuul-merger new file mode 100644 index 0000000..602ac8e --- /dev/null +++ b/files/etc/sysconfig/zuul-merger @@ -0,0 +1,3 @@ +# This file is generated by Ansible +# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN +# diff --git a/files/etc/sysconfig/zuul-server b/files/etc/sysconfig/zuul-server new file mode 100644 index 0000000..602ac8e --- /dev/null +++ b/files/etc/sysconfig/zuul-server @@ -0,0 +1,3 @@ +# This file is generated by Ansible +# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN +# diff --git a/files/etc/systemd/system/zuul-launcher.service b/files/etc/systemd/system/zuul-launcher.service index 66ee93e..71245e9 100644 --- a/files/etc/systemd/system/zuul-launcher.service +++ b/files/etc/systemd/system/zuul-launcher.service @@ -6,7 +6,7 @@ After=syslog.target network.target Type=simple User=zuul Group=zuul -EnvironmentFile=-/etc/sysconfig/zuul +EnvironmentFile=-/etc/sysconfig/zuul-launcher ExecStart=/usr/bin/zuul-launcher -d [Install] diff --git a/files/etc/systemd/system/zuul-merger.service b/files/etc/systemd/system/zuul-merger.service index 77593d8..6a6d39c 100644 --- a/files/etc/systemd/system/zuul-merger.service +++ b/files/etc/systemd/system/zuul-merger.service @@ -6,7 +6,7 @@ After=syslog.target network.target Type=simple User=zuul Group=zuul -EnvironmentFile=-/etc/sysconfig/zuul +EnvironmentFile=-/etc/sysconfig/zuul-merger ExecStart=/usr/bin/zuul-merger -d [Install] diff --git a/files/etc/systemd/system/zuul-server.service b/files/etc/systemd/system/zuul-server.service index f8ed8d4..180c500 100644 --- a/files/etc/systemd/system/zuul-server.service +++ b/files/etc/systemd/system/zuul-server.service @@ -6,7 +6,7 @@ After=syslog.target network.target Type=simple User=zuul Group=zuul -EnvironmentFile=-/etc/sysconfig/zuul +EnvironmentFile=-/etc/sysconfig/zuul-server ExecStart=/usr/bin/zuul-server -d ExecReload=/bin/kill -HUP $MAINPID diff --git a/tasks/service.yaml b/tasks/service.yaml index efbba3c..270d66b 100644 --- a/tasks/service.yaml +++ b/tasks/service.yaml @@ -12,21 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. --- -- name: Define zuul_file_zuul_service_config_dest. - set_fact: - zuul_file_zuul_service_config_dest: "{{ __zuul_file_zuul_service_config_dest }}" - when: zuul_file_zuul_service_config_dest is not defined - -- name: Define zuul_file_zuul_service_config_mode. - set_fact: - zuul_file_zuul_service_config_mode: "{{ __zuul_file_zuul_service_config_mode }}" - when: zuul_file_zuul_service_config_mode is not defined - -- name: Define zuul_file_zuul_service_config_src. - set_fact: - zuul_file_zuul_service_config_src: "{{ __zuul_file_zuul_service_config_src }}" - when: zuul_file_zuul_service_config_src is not defined - - name: Define zuul_file_zuul_launcher_service_dest. set_fact: zuul_file_zuul_launcher_service_dest: "{{ __zuul_file_zuul_launcher_service_dest }}" @@ -42,6 +27,21 @@ zuul_file_zuul_launcher_service_src: "{{ __zuul_file_zuul_launcher_service_src }}" when: zuul_file_zuul_launcher_service_src is not defined +- name: Define zuul_file_zuul_launcher_service_config_dest. + set_fact: + zuul_file_zuul_launcher_service_config_dest: "{{ __zuul_file_zuul_launcher_service_config_dest }}" + when: zuul_file_zuul_launcher_service_config_dest is not defined + +- name: Define zuul_file_zuul_launcher_service_config_mode. + set_fact: + zuul_file_zuul_launcher_service_config_mode: "{{ __zuul_file_zuul_launcher_service_config_mode }}" + when: zuul_file_zuul_launcher_service_config_mode is not defined + +- name: Define zuul_file_zuul_launcher_service_config_src. + set_fact: + zuul_file_zuul_launcher_service_config_src: "{{ __zuul_file_zuul_launcher_service_config_src }}" + when: zuul_file_zuul_launcher_service_config_src is not defined + - name: Define zuul_file_zuul_merger_service_dest. set_fact: zuul_file_zuul_merger_service_dest: "{{ __zuul_file_zuul_merger_service_dest }}" @@ -57,6 +57,21 @@ zuul_file_zuul_merger_service_src: "{{ __zuul_file_zuul_merger_service_src }}" when: zuul_file_zuul_merger_service_src is not defined +- name: Define zuul_file_zuul_merger_service_config_dest. + set_fact: + zuul_file_zuul_merger_service_config_dest: "{{ __zuul_file_zuul_merger_service_config_dest }}" + when: zuul_file_zuul_merger_service_config_dest is not defined + +- name: Define zuul_file_zuul_merger_service_config_mode. + set_fact: + zuul_file_zuul_merger_service_config_mode: "{{ __zuul_file_zuul_merger_service_config_mode }}" + when: zuul_file_zuul_merger_service_config_mode is not defined + +- name: Define zuul_file_zuul_merger_service_config_src. + set_fact: + zuul_file_zuul_merger_service_config_src: "{{ __zuul_file_zuul_merger_service_config_src }}" + when: zuul_file_zuul_merger_service_config_src is not defined + - name: Define zuul_file_zuul_server_service_dest. set_fact: zuul_file_zuul_server_service_dest: "{{ __zuul_file_zuul_server_service_dest }}" @@ -72,14 +87,20 @@ zuul_file_zuul_server_service_src: "{{ __zuul_file_zuul_server_service_src }}" when: zuul_file_zuul_server_service_src is not defined -- name: Copy zuul service config into place. - become: yes - copy: - dest: "{{ zuul_file_zuul_service_config_dest }}" - group: "{{ zuul_file_zuul_service_config_group }}" - mode: "{{ zuul_file_zuul_service_config_mode }}" - owner: "{{ zuul_file_zuul_service_config_owner }}" - src: "{{ zuul_file_zuul_service_config_src }}" +- name: Define zuul_file_zuul_server_service_config_dest. + set_fact: + zuul_file_zuul_server_service_config_dest: "{{ __zuul_file_zuul_server_service_config_dest }}" + when: zuul_file_zuul_server_service_config_dest is not defined + +- name: Define zuul_file_zuul_server_service_config_mode. + set_fact: + zuul_file_zuul_server_service_config_mode: "{{ __zuul_file_zuul_server_service_config_mode }}" + when: zuul_file_zuul_server_service_config_mode is not defined + +- name: Define zuul_file_zuul_server_service_config_src. + set_fact: + zuul_file_zuul_server_service_config_src: "{{ __zuul_file_zuul_server_service_config_src }}" + when: zuul_file_zuul_server_service_config_src is not defined - name: Copy zuul-launcher service into place. become: yes @@ -90,6 +111,15 @@ owner: "{{ zuul_file_zuul_launcher_service_owner }}" src: "{{ zuul_file_zuul_launcher_service_src }}" +- name: Copy zuul-launcher service config into place. + become: yes + copy: + dest: "{{ zuul_file_zuul_launcher_service_config_dest }}" + group: "{{ zuul_file_zuul_launcher_service_config_group }}" + mode: "{{ zuul_file_zuul_launcher_service_config_mode }}" + owner: "{{ zuul_file_zuul_launcher_service_config_owner }}" + src: "{{ zuul_file_zuul_launcher_service_config_src }}" + - name: Copy zuul-merger service into place. become: yes copy: @@ -99,6 +129,15 @@ owner: "{{ zuul_file_zuul_merger_service_owner }}" src: "{{ zuul_file_zuul_merger_service_src }}" +- name: Copy zuul-merger service config into place. + become: yes + copy: + dest: "{{ zuul_file_zuul_merger_service_config_dest }}" + group: "{{ zuul_file_zuul_merger_service_config_group }}" + mode: "{{ zuul_file_zuul_merger_service_config_mode }}" + owner: "{{ zuul_file_zuul_merger_service_config_owner }}" + src: "{{ zuul_file_zuul_merger_service_config_src }}" + - name: Copy zuul-server service into place. become: yes copy: @@ -108,6 +147,15 @@ owner: "{{ zuul_file_zuul_server_service_owner }}" src: "{{ zuul_file_zuul_server_service_src }}" +- name: Copy zuul-server service config into place. + become: yes + copy: + dest: "{{ zuul_file_zuul_server_service_config_dest }}" + group: "{{ zuul_file_zuul_server_service_config_group }}" + mode: "{{ zuul_file_zuul_server_service_config_mode }}" + owner: "{{ zuul_file_zuul_server_service_config_owner }}" + src: "{{ zuul_file_zuul_server_service_config_src }}" + - name: Enable zuul-launcher service. become: yes service: diff --git a/tests/test.yaml b/tests/test.yaml index 6b99b58..1aa4992 100644 --- a/tests/test.yaml +++ b/tests/test.yaml @@ -107,22 +107,6 @@ - zuul_conf_stat.stat.pw_name == 'zuul' - zuul_conf_stat.stat.gr_name == 'zuul' - - name: Register /etc/default/zuul - stat: - path: /etc/default/zuul - register: debian_zuul_service_config_stat - when: ansible_os_family == 'Debian' - - - name: Assert debian_zuul_service_config_stat tests. - assert: - that: - - debian_zuul_service_config_stat.stat.exists - - debian_zuul_service_config_stat.stat.isreg - - debian_zuul_service_config_stat.stat.pw_name == 'root' - - debian_zuul_service_config_stat.stat.gr_name == 'root' - - debian_zuul_service_config_stat.stat.mode == '0644' - when: ansible_os_family == 'Debian' - - name: Register /etc/init.d/zuul-launcher stat: path: /etc/init.d/zuul-launcher @@ -139,6 +123,22 @@ - debian_zuul_launcher_service_stat.stat.mode == '0755' when: ansible_os_family == 'Debian' + - name: Register /etc/default/zuul-launcher + stat: + path: /etc/default/zuul-launcher + register: debian_zuul_launcher_service_config_stat + when: ansible_os_family == 'Debian' + + - name: Assert debian_zuul_launcher_service_config_stat tests. + assert: + that: + - debian_zuul_launcher_service_config_stat.stat.exists + - debian_zuul_launcher_service_config_stat.stat.isreg + - debian_zuul_launcher_service_config_stat.stat.pw_name == 'root' + - debian_zuul_launcher_service_config_stat.stat.gr_name == 'root' + - debian_zuul_launcher_service_config_stat.stat.mode == '0644' + when: ansible_os_family == 'Debian' + - name: Register /etc/init.d/zuul-merger stat: path: /etc/init.d/zuul-merger @@ -155,6 +155,22 @@ - debian_zuul_merger_service_stat.stat.mode == '0755' when: ansible_os_family == 'Debian' + - name: Register /etc/default/zuul-merger + stat: + path: /etc/default/zuul-merger + register: debian_zuul_merger_service_config_stat + when: ansible_os_family == 'Debian' + + - name: Assert debian_zuul_merger_service_config_stat tests. + assert: + that: + - debian_zuul_merger_service_config_stat.stat.exists + - debian_zuul_merger_service_config_stat.stat.isreg + - debian_zuul_merger_service_config_stat.stat.pw_name == 'root' + - debian_zuul_merger_service_config_stat.stat.gr_name == 'root' + - debian_zuul_merger_service_config_stat.stat.mode == '0644' + when: ansible_os_family == 'Debian' + - name: Register /etc/init.d/zuul-server stat: path: /etc/init.d/zuul-server @@ -171,21 +187,21 @@ - debian_zuul_server_service_stat.stat.mode == '0755' when: ansible_os_family == 'Debian' - - name: Register /etc/sysconfig/zuul + - name: Register /etc/default/zuul-server stat: - path: /etc/sysconfig/zuul - register: redhat_zuul_service_config_stat - when: ansible_os_family == 'RedHat' + path: /etc/default/zuul-server + register: debian_zuul_server_service_config_stat + when: ansible_os_family == 'Debian' - - name: Assert redhat_zuul_service_config_stat tests. + - name: Assert debian_zuul_server_service_config_stat tests. assert: that: - - redhat_zuul_service_config_stat.stat.exists - - redhat_zuul_service_config_stat.stat.isreg - - redhat_zuul_service_config_stat.stat.pw_name == 'root' - - redhat_zuul_service_config_stat.stat.gr_name == 'root' - - redhat_zuul_service_config_stat.stat.mode == '0644' - when: ansible_os_family == 'RedHat' + - debian_zuul_server_service_config_stat.stat.exists + - debian_zuul_server_service_config_stat.stat.isreg + - debian_zuul_server_service_config_stat.stat.pw_name == 'root' + - debian_zuul_server_service_config_stat.stat.gr_name == 'root' + - debian_zuul_server_service_config_stat.stat.mode == '0644' + when: ansible_os_family == 'Debian' - name: Register /etc/systemd/system/zuul-launcher.service stat: @@ -203,6 +219,22 @@ - redhat_zuul_launcher_service_stat.stat.mode == '0644' when: ansible_os_family == 'RedHat' + - name: Register /etc/sysconfig/zuul-launcher + stat: + path: /etc/sysconfig/zuul-launcher + register: redhat_zuul_launcher_service_config_stat + when: ansible_os_family == 'RedHat' + + - name: Assert redhat_zuul_launcher_service_config_stat tests. + assert: + that: + - redhat_zuul_launcher_service_config_stat.stat.exists + - redhat_zuul_launcher_service_config_stat.stat.isreg + - redhat_zuul_launcher_service_config_stat.stat.pw_name == 'root' + - redhat_zuul_launcher_service_config_stat.stat.gr_name == 'root' + - redhat_zuul_launcher_service_config_stat.stat.mode == '0644' + when: ansible_os_family == 'RedHat' + - name: Register /etc/systemd/system/zuul-merger.service stat: path: /etc/systemd/system/zuul-merger.service @@ -219,6 +251,22 @@ - redhat_zuul_merger_service_stat.stat.mode == '0644' when: ansible_os_family == 'RedHat' + - name: Register /etc/sysconfig/zuul-merger + stat: + path: /etc/sysconfig/zuul-merger + register: redhat_zuul_merger_service_config_stat + when: ansible_os_family == 'RedHat' + + - name: Assert redhat_zuul_merger_service_config_stat tests. + assert: + that: + - redhat_zuul_merger_service_config_stat.stat.exists + - redhat_zuul_merger_service_config_stat.stat.isreg + - redhat_zuul_merger_service_config_stat.stat.pw_name == 'root' + - redhat_zuul_merger_service_config_stat.stat.gr_name == 'root' + - redhat_zuul_merger_service_config_stat.stat.mode == '0644' + when: ansible_os_family == 'RedHat' + - name: Register /etc/systemd/system/zuul-server.service stat: path: /etc/systemd/system/zuul-server.service @@ -235,6 +283,22 @@ - redhat_zuul_server_service_stat.stat.mode == '0644' when: ansible_os_family == 'RedHat' + - name: Register /etc/sysconfig/zuul-server + stat: + path: /etc/sysconfig/zuul-server + register: redhat_zuul_server_service_config_stat + when: ansible_os_family == 'RedHat' + + - name: Assert redhat_zuul_server_service_config_stat tests. + assert: + that: + - redhat_zuul_server_service_config_stat.stat.exists + - redhat_zuul_server_service_config_stat.stat.isreg + - redhat_zuul_server_service_config_stat.stat.pw_name == 'root' + - redhat_zuul_server_service_config_stat.stat.gr_name == 'root' + - redhat_zuul_server_service_config_stat.stat.mode == '0644' + when: ansible_os_family == 'RedHat' + - name: Ensure zuul-launcher is running. shell: /usr/sbin/service zuul-launcher status tags: skip_ansible_lint diff --git a/vars/Debian.yaml b/vars/Debian.yaml index f89fba5..8c5b5a9 100644 --- a/vars/Debian.yaml +++ b/vars/Debian.yaml @@ -16,18 +16,26 @@ __zuul_build_depends: - git - python-dev -__zuul_file_zuul_service_config_dest: /etc/default/zuul -__zuul_file_zuul_service_config_mode: "0644" -__zuul_file_zuul_service_config_src: etc/default/zuul - __zuul_file_zuul_launcher_service_dest: /etc/init.d/zuul-launcher __zuul_file_zuul_launcher_service_mode: "0755" __zuul_file_zuul_launcher_service_src: etc/init.d/zuul-launcher +__zuul_file_zuul_launcher_service_config_dest: /etc/default/zuul-launcher +__zuul_file_zuul_launcher_service_config_mode: "0644" +__zuul_file_zuul_launcher_service_config_src: etc/default/zuul-launcher + __zuul_file_zuul_merger_service_dest: /etc/init.d/zuul-merger __zuul_file_zuul_merger_service_mode: "0755" __zuul_file_zuul_merger_service_src: etc/init.d/zuul-merger +__zuul_file_zuul_merger_service_config_dest: /etc/default/zuul-merger +__zuul_file_zuul_merger_service_config_mode: "0644" +__zuul_file_zuul_merger_service_config_src: etc/default/zuul-merger + __zuul_file_zuul_server_service_dest: /etc/init.d/zuul-server __zuul_file_zuul_server_service_mode: "0755" __zuul_file_zuul_server_service_src: etc/init.d/zuul-server + +__zuul_file_zuul_server_service_config_dest: /etc/default/zuul-server +__zuul_file_zuul_server_service_config_mode: "0644" +__zuul_file_zuul_server_service_config_src: etc/default/zuul-server diff --git a/vars/RedHat.yaml b/vars/RedHat.yaml index fc5dcff..cc2ed08 100644 --- a/vars/RedHat.yaml +++ b/vars/RedHat.yaml @@ -18,18 +18,26 @@ __zuul_build_depends: - git - python-devel -__zuul_file_zuul_service_config_dest: /etc/sysconfig/zuul -__zuul_file_zuul_service_config_mode: "0644" -__zuul_file_zuul_service_config_src: etc/sysconfig/zuul - __zuul_file_zuul_launcher_service_dest: /etc/systemd/system/zuul-launcher.service __zuul_file_zuul_launcher_service_mode: "0644" __zuul_file_zuul_launcher_service_src: etc/systemd/system/zuul-launcher.service +__zuul_file_zuul_launcher_service_config_dest: /etc/sysconfig/zuul-launcher +__zuul_file_zuul_launcher_service_config_mode: "0644" +__zuul_file_zuul_launcher_service_config_src: etc/sysconfig/zuul-launcher + __zuul_file_zuul_merger_service_dest: /etc/systemd/system/zuul-merger.service __zuul_file_zuul_merger_service_mode: "0644" __zuul_file_zuul_merger_service_src: etc/systemd/system/zuul-merger.service +__zuul_file_zuul_merger_service_config_dest: /etc/sysconfig/zuul-merger +__zuul_file_zuul_merger_service_config_mode: "0644" +__zuul_file_zuul_merger_service_config_src: etc/sysconfig/zuul-merger + __zuul_file_zuul_server_service_dest: /etc/systemd/system/zuul-server.service __zuul_file_zuul_server_service_mode: "0644" __zuul_file_zuul_server_service_src: etc/systemd/system/zuul-server.service + +__zuul_file_zuul_server_service_config_dest: /etc/sysconfig/zuul-server +__zuul_file_zuul_server_service_config_mode: "0644" +__zuul_file_zuul_server_service_config_src: etc/sysconfig/zuul-server