From 30ce327d55eb0e6df8663788c3d9304eb278ec29 Mon Sep 17 00:00:00 2001 From: Bertrand Lanson Date: Sun, 3 Dec 2023 17:48:46 +0100 Subject: [PATCH] feat: remove become from role --- handlers/main.yml | 2 -- molecule/default/converge.yml | 1 + molecule/default/verify.yml | 3 ++- molecule/default_vagrant/converge.yml | 1 + molecule/default_vagrant/verify.yml | 1 + molecule/with_custom_config/converge.yml | 1 + molecule/with_custom_config/verify.yml | 3 ++- molecule/with_custom_config_vagrant/converge.yml | 1 + molecule/with_custom_config_vagrant/verify.yml | 1 + tasks/configure.yml | 1 - tasks/install.yml | 1 - tasks/remove_existing.yml | 2 -- 12 files changed, 10 insertions(+), 8 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index 5d0f80f..5203b05 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -3,7 +3,6 @@ - name: "Generate netplan configuration" ansible.builtin.command: netplan generate changed_when: false - become: true listen: "netplan-generate" - name: "Apply netplan configuration" @@ -11,4 +10,3 @@ listen: "netplan-apply" changed_when: false when: manage_netplan_apply - become: true diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 74b1609..80a3941 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.manage_netplan" ansible.builtin.include_role: diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index f310af1..7723272 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: diff --git a/molecule/default_vagrant/converge.yml b/molecule/default_vagrant/converge.yml index 74b1609..80a3941 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.manage_netplan" ansible.builtin.include_role: diff --git a/molecule/default_vagrant/verify.yml b/molecule/default_vagrant/verify.yml index 5dbba4e..1184615 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: diff --git a/molecule/with_custom_config/converge.yml b/molecule/with_custom_config/converge.yml index 74b1609..80a3941 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.manage_netplan" ansible.builtin.include_role: diff --git a/molecule/with_custom_config/verify.yml b/molecule/with_custom_config/verify.yml index 0fe44a6..58ccb97 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: diff --git a/molecule/with_custom_config_vagrant/converge.yml b/molecule/with_custom_config_vagrant/converge.yml index 74b1609..80a3941 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.manage_netplan" ansible.builtin.include_role: diff --git a/molecule/with_custom_config_vagrant/verify.yml b/molecule/with_custom_config_vagrant/verify.yml index f267f5a..7c883fe 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: diff --git a/tasks/configure.yml b/tasks/configure.yml index b28ea9c..604c999 100644 --- a/tasks/configure.yml +++ b/tasks/configure.yml @@ -9,7 +9,6 @@ group: root backup: true when: manage_netplan_configuration != [] - become: true notify: - "netplan-generate" - "netplan-apply" diff --git a/tasks/install.yml b/tasks/install.yml index cfbc2ab..8b0be68 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -20,4 +20,3 @@ owner: "root" group: "root" mode: '0755' - become: true diff --git a/tasks/remove_existing.yml b/tasks/remove_existing.yml index 46d87ce..cb6da07 100644 --- a/tasks/remove_existing.yml +++ b/tasks/remove_existing.yml @@ -5,7 +5,6 @@ paths: /etc/netplan patterns: "*.yml,*.yaml" register: _netplan_configs - become: true - name: "Removing existing configurations" ansible.builtin.file: @@ -14,4 +13,3 @@ loop: "{{ _netplan_configs['files'] }}" when: item['path'] != manage_netplan_config_file and manage_netplan_configuration != [] - become: true