diff --git a/defaults/main.yaml b/defaults/main.yaml index 7894a60..4607ff5 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -57,3 +57,16 @@ zuul_git_version: master zuul_install_method: git zuul_pip_version: + +# tasks/service.yaml +zuul_file_zuul_merger_service_dest: /etc/systemd/system +zuul_file_zuul_merger_service_group: root +zuul_file_zuul_merger_service_mode: "0644" +zuul_file_zuul_merger_service_owner: root +zuul_file_zuul_merger_service_src: ../../files/etc/systemd/system/zuul-merger.service + +zuul_file_zuul_server_service_dest: /etc/systemd/system +zuul_file_zuul_server_service_group: root +zuul_file_zuul_server_service_mode: "0644" +zuul_file_zuul_server_service_owner: root +zuul_file_zuul_server_service_src: ../../files/etc/systemd/system/zuul-server.service diff --git a/files/zuul-merger.service b/files/etc/systemd/system/zuul-merger.service similarity index 100% rename from files/zuul-merger.service rename to files/etc/systemd/system/zuul-merger.service diff --git a/files/zuul-server.service b/files/etc/systemd/system/zuul-server.service similarity index 100% rename from files/zuul-server.service rename to files/etc/systemd/system/zuul-server.service diff --git a/tasks/service/redhat.yaml b/tasks/service/redhat.yaml index eab83f4..06ed918 100644 --- a/tasks/service/redhat.yaml +++ b/tasks/service/redhat.yaml @@ -14,13 +14,19 @@ --- - name: Copy systemd file into place for zuul-merger. copy: - dest: /etc/systemd/system - src: ../../files/zuul-merger.service + dest: "{{ zuul_file_zuul_merger_service_dest }}" + group: "{{ zuul_file_zuul_merger_service_group }}" + mode: "{{ zuul_file_zuul_merger_service_mode }}" + owner: "{{ zuul_file_zuul_merger_service_owner }}" + src: "{{ zuul_file_zuul_merger_service_src }}" - name: Copy systemd file into place for zuul-server. copy: - dest: /etc/systemd/system - src: ../../files/zuul-server.service + dest: "{{ zuul_file_zuul_server_service_dest }}" + group: "{{ zuul_file_zuul_server_service_group }}" + mode: "{{ zuul_file_zuul_server_service_mode }}" + owner: "{{ zuul_file_zuul_server_service_owner }}" + src: "{{ zuul_file_zuul_server_service_src }}" - name: Copy sysconfig file into place. copy: diff --git a/tests/test.yaml b/tests/test.yaml index 13c9801..a362cee 100644 --- a/tests/test.yaml +++ b/tests/test.yaml @@ -84,3 +84,31 @@ shell: "ls -1 /etc/zuul/config | wc -l" register: result failed_when: result.stdout != "0" + + - name: Register /etc/systemd/system/zuul-merger.service + stat: + path: /etc/systemd/system/zuul-merger.service + register: zuul_merger_service_stat + + - name: Assert zuul_merger_service_stat tests. + assert: + that: + - zuul_merger_service_stat.stat.exists + - zuul_merger_service_stat.stat.isreg + - zuul_merger_service_stat.stat.pw_name == 'root' + - zuul_merger_service_stat.stat.gr_name == 'root' + - zuul_merger_service_stat.stat.mode == '0644' + + - name: Register /etc/systemd/system/zuul-server.service + stat: + path: /etc/systemd/system/zuul-server.service + register: zuul_server_service_stat + + - name: Assert zuul_server_service_stat tests. + assert: + that: + - zuul_server_service_stat.stat.exists + - zuul_server_service_stat.stat.isreg + - zuul_server_service_stat.stat.pw_name == 'root' + - zuul_server_service_stat.stat.gr_name == 'root' + - zuul_server_service_stat.stat.mode == '0644'