diff --git a/defaults/main.yml b/defaults/main.yml index 5ac472bd..3e17a60f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -60,6 +60,7 @@ consul_systemd_restart: on-failure consul_systemd_restart_sec: 42 consul_systemd_limit_nofile: 65536 consul_systemd_unit_path: /lib/systemd/system +consul_systemd_service_name: consul ### Log user, group, facility syslog_user: "{{ lookup('env', 'SYSLOG_USER') | default('root', true) }}" diff --git a/handlers/restart_consul.yml b/handlers/restart_consul.yml index 88906820..e78d7ebb 100644 --- a/handlers/restart_consul.yml +++ b/handlers/restart_consul.yml @@ -8,7 +8,7 @@ - name: Restart consul on Unix ansible.builtin.service: - name: consul + name: "{{ consul_systemd_service_name }}" state: restarted # Needed to force SysV service manager on Docker for Molecule tests use: "{{ ansible_service_mgr }}" @@ -38,7 +38,7 @@ - name: Restart consul on Windows ansible.windows.win_service: - name: consul + name: "{{ consul_systemd_service_name }}" state: restarted # Some tasks with `become: true` end up calling this task. Unfortunately, the `become` # property is evaluated before the `when` condition and this results in an Ansible diff --git a/handlers/start_consul.yml b/handlers/start_consul.yml index e9b7e993..cc83f3df 100644 --- a/handlers/start_consul.yml +++ b/handlers/start_consul.yml @@ -1,7 +1,7 @@ --- - name: Start consul on Unix ansible.builtin.service: - name: consul + name: "{{ consul_systemd_service_name }}" state: started # Needed to force SysV service manager on Docker for Molecule tests use: "{{ ansible_service_mgr }}" @@ -17,7 +17,7 @@ - name: Start consul on Windows ansible.windows.win_service: - name: consul + name: "{{ consul_systemd_service_name }}" state: started when: ansible_os_family == "Windows" listen: start consul diff --git a/tasks/install_linux_repo.yml b/tasks/install_linux_repo.yml index e6ebd8b2..79e7010e 100644 --- a/tasks/install_linux_repo.yml +++ b/tasks/install_linux_repo.yml @@ -22,7 +22,7 @@ - name: Stop service consul, if running ansible.builtin.service: - name: consul + name: "{{ consul_systemd_service_name }}" state: stopped # Needed to force SysV service manager on Docker for Molecule tests use: "{{ ansible_service_mgr }}" @@ -80,9 +80,9 @@ state: present become: true -- name: Create a directory /etc/systemd/system/consul.service.d +- name: "Create a directory /etc/systemd/system/{{ consul_systemd_service_name }}.service.d" ansible.builtin.file: - path: /etc/systemd/system/consul.service.d + path: "/etc/systemd/system/{{ consul_systemd_service_name }}.service.d" state: directory mode: "0755" owner: root @@ -94,7 +94,7 @@ - name: Override systemd service params ansible.builtin.template: src: consul_systemd_service.override.j2 - dest: /etc/systemd/system/consul.service.d/override.conf + dest: "/etc/systemd/system/{{ consul_systemd_service_name }}.service.d/override.conf" owner: root group: root mode: "0644" diff --git a/tasks/leave_restart_consul.yml b/tasks/leave_restart_consul.yml index ec8d7562..418fb459 100644 --- a/tasks/leave_restart_consul.yml +++ b/tasks/leave_restart_consul.yml @@ -8,7 +8,7 @@ - name: Restart consul on Unix delegate_to: "{{ rolling_restart_host }}" ansible.builtin.service: - name: consul + name: "{{ consul_systemd_service_name }}" state: restarted # Needed to force SysV service manager on Docker for Molecule tests use: "{{ ansible_service_mgr }}" diff --git a/tasks/nix.yml b/tasks/nix.yml index b21e345c..40dd5da0 100644 --- a/tasks/nix.yml +++ b/tasks/nix.yml @@ -234,7 +234,7 @@ - name: Create systemd script ansible.builtin.template: src: consul_systemd.service.j2 - dest: "{{ consul_systemd_unit_path }}/consul.service" + dest: "{{ consul_systemd_unit_path }}/{{ consul_systemd_service_name }}.service" owner: root group: root mode: "0644" @@ -254,7 +254,7 @@ - name: Enable consul at startup (systemd) ansible.builtin.systemd_service: - name: consul + name: "{{ consul_systemd_service_name }}" enabled: true when: - ansible_service_mgr == "systemd" @@ -312,7 +312,7 @@ block: - name: Start Consul ansible.builtin.service: - name: consul + name: "{{ consul_systemd_service_name }}" state: started enabled: true # Needed to force SysV service manager on Docker for Molecule tests diff --git a/templates/consul_systemd_snapshot.service.j2 b/templates/consul_systemd_snapshot.service.j2 index 0fa70df8..e0083422 100644 --- a/templates/consul_systemd_snapshot.service.j2 +++ b/templates/consul_systemd_snapshot.service.j2 @@ -11,7 +11,7 @@ [Unit] Description=Consul snapshot agent Requires=network-online.target -Requisite=consul.service +Requisite={{ consul_systemd_service_name }}.service After=network-online.target [Service] @@ -30,4 +30,4 @@ Environment={{ var }} {% endfor %} [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target