diff --git a/handlers/main.yml b/handlers/main.yml index ba0e721..4b0e0bc 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -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" diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index b2b50da..9774fd3 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -1,6 +1,7 @@ --- - name: Converge hosts: all + become: true tasks: - name: "Include ednxzu.deploy_adguard" ansible.builtin.include_role: diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index b9adfa8..a254f05 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -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: diff --git a/molecule/default_vagrant/converge.yml b/molecule/default_vagrant/converge.yml index b2b50da..9774fd3 100644 --- a/molecule/default_vagrant/converge.yml +++ b/molecule/default_vagrant/converge.yml @@ -1,6 +1,7 @@ --- - name: Converge hosts: all + become: true tasks: - name: "Include ednxzu.deploy_adguard" ansible.builtin.include_role: diff --git a/molecule/default_vagrant/verify.yml b/molecule/default_vagrant/verify.yml index fa05439..5e44b32 100644 --- a/molecule/default_vagrant/verify.yml +++ b/molecule/default_vagrant/verify.yml @@ -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: diff --git a/molecule/with_extra_sidecars/converge.yml b/molecule/with_extra_sidecars/converge.yml index b2b50da..9774fd3 100644 --- a/molecule/with_extra_sidecars/converge.yml +++ b/molecule/with_extra_sidecars/converge.yml @@ -1,6 +1,7 @@ --- - name: Converge hosts: all + become: true tasks: - name: "Include ednxzu.deploy_adguard" ansible.builtin.include_role: diff --git a/molecule/with_extra_sidecars/verify.yml b/molecule/with_extra_sidecars/verify.yml index 0428c2b..f4bacb2 100644 --- a/molecule/with_extra_sidecars/verify.yml +++ b/molecule/with_extra_sidecars/verify.yml @@ -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: diff --git a/molecule/with_extra_sidecars_vagrant/converge.yml b/molecule/with_extra_sidecars_vagrant/converge.yml index b2b50da..9774fd3 100644 --- a/molecule/with_extra_sidecars_vagrant/converge.yml +++ b/molecule/with_extra_sidecars_vagrant/converge.yml @@ -1,6 +1,7 @@ --- - name: Converge hosts: all + become: true tasks: - name: "Include ednxzu.deploy_adguard" ansible.builtin.include_role: diff --git a/molecule/with_extra_sidecars_vagrant/verify.yml b/molecule/with_extra_sidecars_vagrant/verify.yml index 74752a0..e5647db 100644 --- a/molecule/with_extra_sidecars_vagrant/verify.yml +++ b/molecule/with_extra_sidecars_vagrant/verify.yml @@ -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: diff --git a/tasks/configure.yml b/tasks/configure.yml index 4ab612c..c5e132f 100644 --- a/tasks/configure.yml +++ b/tasks/configure.yml @@ -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 diff --git a/tasks/consul_service.yml b/tasks/consul_service.yml index e637cc4..ad160cc 100644 --- a/tasks/consul_service.yml +++ b/tasks/consul_service.yml @@ -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" diff --git a/tasks/prerequisites.yml b/tasks/prerequisites.yml index 69cb3de..c9e8361 100644 --- a/tasks/prerequisites.yml +++ b/tasks/prerequisites.yml @@ -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