feat: emove become from role
All checks were successful
test / Linting (push) Successful in 39s
test / Molecule tests (default, debian12) (push) Successful in 58s
test / Molecule tests (default, debian11) (push) Successful in 1m22s
test / Molecule tests (default, ubuntu2004) (push) Successful in 59s
test / Molecule tests (default, ubuntu2204) (push) Successful in 58s
test / Molecule tests (with_extra_sidecars, debian11) (push) Successful in 53s
test / Molecule tests (with_extra_sidecars, debian12) (push) Successful in 1m6s
test / Molecule tests (with_extra_sidecars, ubuntu2004) (push) Successful in 39s
test / Molecule tests (with_extra_sidecars, ubuntu2204) (push) Successful in 33s

This commit is contained in:
Bertrand Lanson 2023-12-03 16:51:47 +01:00
parent 3d1d620edc
commit 0b0fc6673e
12 changed files with 8 additions and 22 deletions

View File

@ -3,21 +3,18 @@
- name: "Reload systemd file"
ansible.builtin.systemd:
daemon_reload: true
become: true
listen: "systemctl-daemon-reload"
- name: "Enable adguard service"
ansible.builtin.service:
name: adguard
enabled: true
become: true
listen: "systemctl-enable-adguard"
- name: "Start adguard service"
ansible.builtin.service:
name: adguard
state: restarted
become: true
listen: "systemctl-restart-adguard"
throttle: 1
when: deploy_adguard_start_service
@ -35,5 +32,4 @@
name: adguard-connect-proxy
enabled: true
state: restarted
become: true
listen: "systemctl-enable-restart-adguard-connect-proxy"

View File

@ -1,6 +1,7 @@
---
- name: Converge
hosts: all
become: true
tasks:
- name: "Include ednxzu.deploy_adguard"
ansible.builtin.include_role:

View File

@ -2,6 +2,7 @@
- name: Verify
hosts: all
gather_facts: false
become: true
tasks:
- name: "Test: directory /opt/adguard"
block:
@ -53,7 +54,6 @@
ansible.builtin.slurp:
src: "/etc/systemd/system/adguard.service"
register: slurp_etc_systemd_system_adguard_service
become: true
- name: "Verify service adguard"
ansible.builtin.assert:
@ -75,8 +75,6 @@
ansible.builtin.slurp:
src: "/opt/adguard/docker-compose.yml"
register: slurp_opt_adguard_docker_compose_yml
become: true
- name: "Set fact for file content /opt/adguard/docker-compose.yml"
ansible.builtin.set_fact:

View File

@ -1,6 +1,7 @@
---
- name: Converge
hosts: all
become: true
tasks:
- name: "Include ednxzu.deploy_adguard"
ansible.builtin.include_role:

View File

@ -2,6 +2,7 @@
- name: Verify
hosts: all
gather_facts: true
become: true
tasks:
- name: "Test: directory /opt/adguard"
block:
@ -53,7 +54,6 @@
ansible.builtin.slurp:
src: "/etc/systemd/system/adguard.service"
register: slurp_etc_systemd_system_adguard_service
become: true
- name: "Verify service adguard"
ansible.builtin.assert:
@ -75,8 +75,6 @@
ansible.builtin.slurp:
src: "/opt/adguard/docker-compose.yml"
register: slurp_opt_adguard_docker_compose_yml
become: true
- name: "Set fact for file content /opt/adguard/docker-compose.yml"
ansible.builtin.set_fact:

View File

@ -1,6 +1,7 @@
---
- name: Converge
hosts: all
become: true
tasks:
- name: "Include ednxzu.deploy_adguard"
ansible.builtin.include_role:

View File

@ -2,6 +2,7 @@
- name: Verify
hosts: all
gather_facts: false
become: true
tasks:
- name: "Test: directory /opt/adguard"
block:
@ -53,7 +54,6 @@
ansible.builtin.slurp:
src: "/etc/systemd/system/adguard.service"
register: slurp_etc_systemd_system_adguard_service
become: true
- name: "Verify service adguard"
ansible.builtin.assert:
@ -75,7 +75,6 @@
ansible.builtin.slurp:
src: "/opt/adguard/docker-compose.yml"
register: slurp_opt_adguard_docker_compose_yml
become: true
- name: "Set fact for file content /opt/adguard/docker-compose.yml"
ansible.builtin.set_fact:

View File

@ -1,6 +1,7 @@
---
- name: Converge
hosts: all
become: true
tasks:
- name: "Include ednxzu.deploy_adguard"
ansible.builtin.include_role:

View File

@ -2,6 +2,7 @@
- name: Verify
hosts: all
gather_facts: true
become: true
tasks:
- name: "Test: directory /opt/adguard"
block:
@ -53,7 +54,6 @@
ansible.builtin.slurp:
src: "/etc/systemd/system/adguard.service"
register: slurp_etc_systemd_system_adguard_service
become: true
- name: "Verify service adguard"
ansible.builtin.assert:
@ -75,7 +75,6 @@
ansible.builtin.slurp:
src: "/opt/adguard/docker-compose.yml"
register: slurp_opt_adguard_docker_compose_yml
become: true
- name: "Set fact for file content /opt/adguard/docker-compose.yml"
ansible.builtin.set_fact:

View File

@ -7,12 +7,10 @@
owner: root
group: root
mode: '0644'
become: true
notify:
- systemctl-daemon-reload
- name: "Configure docker-compose deployment"
become: true
block:
- name: "Copy docker-compose.yml template"
ansible.builtin.template:
@ -44,6 +42,5 @@
group: root
mode: '0600'
when: deploy_adguard_config != {}
become: true
notify:
- systemctl-restart-adguard

View File

@ -7,12 +7,10 @@
owner: root
group: root
mode: '0644'
become: true
notify:
- "consul-services-register-adguard"
- name: "Configure service mesh proxy"
become: true
when: deploy_adguard_consul['configuration']['service']['connect'] is defined
block:
- name: "Copy adguard-connect-proxy.env file"

View File

@ -7,7 +7,6 @@
owner: root
group: root
mode: '0755'
become: true
- name: "Create adguard/conf directory"
ansible.builtin.file:
@ -16,7 +15,6 @@
owner: root
group: root
mode: '0755'
become: true
- name: "Create adguard/data directory"
ansible.builtin.file:
@ -25,4 +23,3 @@
owner: root
group: root
mode: '0755'
become: true