From 67666c1c5ec62c6ca86744a4bd0c029d489efe58 Mon Sep 17 00:00:00 2001 From: Bertrand Lanson Date: Sun, 30 Jul 2023 14:49:57 +0200 Subject: [PATCH] remove auto-install dependencies, to make roles more standard --- README.md | 2 +- molecule/default/requirements.yml | 3 ++- molecule/with_custom_config/requirements.yml | 3 ++- tasks/main.yml | 3 --- tasks/prerequisites.yml | 10 ---------- vars/main.yml | 2 -- 6 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 tasks/prerequisites.yml diff --git a/README.md b/README.md index aae7514..1ec5284 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ This variable contains the content of your netplan file in yml format. This what Dependencies ------------ -This role has a task that installs its own dependencies located in `task/prerequisites.yml`, so that you don't need to manage them. This role requires `ednxzu.manage_apt_packages` to install netplan and eventually network-manager if needed. +`ednxzu.manage_apt_packages` to install needed packages for netplan. Example Playbook ---------------- diff --git a/molecule/default/requirements.yml b/molecule/default/requirements.yml index e9320f9..ca250b7 100644 --- a/molecule/default/requirements.yml +++ b/molecule/default/requirements.yml @@ -1,3 +1,4 @@ --- # requirements file for molecule -roles: [] +roles: + - name: ednxzu.manage_apt_packages diff --git a/molecule/with_custom_config/requirements.yml b/molecule/with_custom_config/requirements.yml index e9320f9..e354421 100644 --- a/molecule/with_custom_config/requirements.yml +++ b/molecule/with_custom_config/requirements.yml @@ -1,3 +1,4 @@ --- # requirements file for molecule -roles: [] +roles: + - name: ednxzu.manage_apt_packages \ No newline at end of file diff --git a/tasks/main.yml b/tasks/main.yml index a86c29f..30e0d2e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,8 +1,5 @@ --- # task/main file for manage_netplan -- name: "Import prerequisites.yml" - ansible.builtin.include_tasks: prerequisites.yml - - name: "Import install.yml" ansible.builtin.include_tasks: install.yml when: manage_netplan_install diff --git a/tasks/prerequisites.yml b/tasks/prerequisites.yml deleted file mode 100644 index a1da411..0000000 --- a/tasks/prerequisites.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# task/prerequisites file for manage_netplan -- name: "Install required roles" - ansible.builtin.command: - cmd: "ansible-galaxy install {{ item }}" - loop: "{{ manage_netplan_prerequisites_roles }}" - changed_when: false - become: false - delegate_to: localhost - run_once: true diff --git a/vars/main.yml b/vars/main.yml index b9201f4..1cf6c3c 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,7 +1,5 @@ --- # vars file for manage_netplan -manage_netplan_prerequisites_roles: - - ednxzu.manage_apt_packages manage_netplan_packages: - name: netplan.io version: latest