From 3daa587e89e15fad49698ee85c5375fac62279f5 Mon Sep 17 00:00:00 2001 From: Bertrand Lanson Date: Sun, 3 Dec 2023 17:29:45 +0100 Subject: [PATCH] feat: remove become from playbook --- handlers/main.yml | 2 -- molecule/default/converge.yml | 1 + molecule/default/verify.yml | 4 ++-- molecule/default_vagrant/converge.yml | 1 + molecule/default_vagrant/verify.yml | 2 +- molecule/with_custom_config/converge.yml | 1 + molecule/with_custom_config/verify.yml | 4 ++-- molecule/with_custom_config_vagrant/converge.yml | 1 + molecule/with_custom_config_vagrant/verify.yml | 2 +- tasks/configure.yml | 2 -- tasks/install_compose.yml | 3 --- tasks/main.yml | 1 - tasks/prerequisites.yml | 2 -- 13 files changed, 10 insertions(+), 16 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index 2e2f446..2b1b5c5 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -4,13 +4,11 @@ ansible.builtin.service: name: docker enabled: true - become: true listen: "systemctl-enable-docker" - name: "Reload docker service" ansible.builtin.service: name: docker state: reloaded - become: true listen: "systemctl-reload-docker" when: install_docker_start_service diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 3825f52..39617ab 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.install_docker" ansible.builtin.include_role: diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 5fbdaba..ba917ce 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -1,7 +1,8 @@ --- - name: Verify hosts: all - gather_facts: false + gather_facts: true + become: true tasks: - name: "Test: file /etc/hosts" block: @@ -78,7 +79,6 @@ - name: "Command docker ps" ansible.builtin.command: "docker ps" changed_when: false - become: true register: docker_ps - name: "Verify docker interaction" diff --git a/molecule/default_vagrant/converge.yml b/molecule/default_vagrant/converge.yml index 3825f52..39617ab 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.install_docker" ansible.builtin.include_role: diff --git a/molecule/default_vagrant/verify.yml b/molecule/default_vagrant/verify.yml index 47ace28..64ba13c 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: file /etc/hosts" block: @@ -82,7 +83,6 @@ - name: "Command docker ps" ansible.builtin.command: "docker ps" changed_when: false - become: true register: docker_ps - name: "Verify docker interaction" diff --git a/molecule/with_custom_config/converge.yml b/molecule/with_custom_config/converge.yml index 3825f52..39617ab 100644 --- a/molecule/with_custom_config/converge.yml +++ b/molecule/with_custom_config/converge.yml @@ -1,6 +1,7 @@ --- - name: Converge hosts: all + become: true tasks: - name: "Include ednxzu.install_docker" ansible.builtin.include_role: diff --git a/molecule/with_custom_config/verify.yml b/molecule/with_custom_config/verify.yml index 7a75640..d200212 100644 --- a/molecule/with_custom_config/verify.yml +++ b/molecule/with_custom_config/verify.yml @@ -1,7 +1,8 @@ --- - name: Verify hosts: all - gather_facts: false + gather_facts: true + become: true tasks: - name: "Test: file /etc/hosts" block: @@ -78,7 +79,6 @@ - name: "Command docker ps" ansible.builtin.command: "docker ps" changed_when: false - become: true register: docker_ps - name: "Verify docker interaction" diff --git a/molecule/with_custom_config_vagrant/converge.yml b/molecule/with_custom_config_vagrant/converge.yml index 3825f52..39617ab 100644 --- a/molecule/with_custom_config_vagrant/converge.yml +++ b/molecule/with_custom_config_vagrant/converge.yml @@ -1,6 +1,7 @@ --- - name: Converge hosts: all + become: true tasks: - name: "Include ednxzu.install_docker" ansible.builtin.include_role: diff --git a/molecule/with_custom_config_vagrant/verify.yml b/molecule/with_custom_config_vagrant/verify.yml index e7e9c29..a8576b1 100644 --- a/molecule/with_custom_config_vagrant/verify.yml +++ b/molecule/with_custom_config_vagrant/verify.yml @@ -2,6 +2,7 @@ - name: Verify hosts: all gather_facts: true + become: true tasks: - name: "Test: file /etc/hosts" block: @@ -82,7 +83,6 @@ - name: "Command docker ps" ansible.builtin.command: "docker ps" changed_when: false - become: true register: docker_ps - name: "Verify docker interaction" diff --git a/tasks/configure.yml b/tasks/configure.yml index 13d7103..8405372 100644 --- a/tasks/configure.yml +++ b/tasks/configure.yml @@ -6,7 +6,6 @@ groups: "{{ install_docker_group }}" append: true loop: "{{ install_docker_users }}" - become: true - name: "Copy daemon.json template" ansible.builtin.template: @@ -15,7 +14,6 @@ owner: root group: root mode: '0644' - become: true notify: - "systemctl-enable-docker" - "systemctl-reload-docker" diff --git a/tasks/install_compose.yml b/tasks/install_compose.yml index 1fd0914..c630394 100644 --- a/tasks/install_compose.yml +++ b/tasks/install_compose.yml @@ -14,7 +14,6 @@ check_mode: false changed_when: false failed_when: false - become: true - name: "Set facts for wanted compose release" ansible.builtin.set_fact: @@ -35,7 +34,6 @@ register: _docker_compose_binary_removed when: install_docker_compose_current_version is defined and install_docker_compose_wanted_version not in install_docker_compose_current_version - become: true - name: "Download and install compose:{{ install_docker_compose_version }}" ansible.builtin.get_url: @@ -46,4 +44,3 @@ mode: '0755' when: (install_docker_compose_current_version is not defined) or (_docker_compose_binary_removed.changed) - become: true diff --git a/tasks/main.yml b/tasks/main.yml index 03a7396..037ff5c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -21,5 +21,4 @@ ansible.builtin.service: name: docker state: started - become: true when: install_docker_start_service diff --git a/tasks/prerequisites.yml b/tasks/prerequisites.yml index 5836247..7136fb4 100644 --- a/tasks/prerequisites.yml +++ b/tasks/prerequisites.yml @@ -4,7 +4,6 @@ ansible.builtin.group: name: "{{ install_docker_group }}" state: present - become: true - name: "Create directory {{ install_docker_daemon_dir }}" ansible.builtin.file: @@ -13,4 +12,3 @@ owner: root group: root mode: '0755' - become: true