From a665439a5cdfe339247e6f63c93378b5cddac036 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Thu, 31 Aug 2023 15:33:26 +0200 Subject: use role dependencies where appropriate --- roles/linux_status/meta/main.yml | 6 ++++++ roles/linux_status/tasks/main.yml | 8 -------- roles/wireguard/meta/main.yml | 3 +++ roles/wireguard/tasks/main.yml | 5 ----- 4 files changed, 9 insertions(+), 13 deletions(-) create mode 100644 roles/linux_status/meta/main.yml create mode 100644 roles/wireguard/meta/main.yml (limited to 'roles') diff --git a/roles/linux_status/meta/main.yml b/roles/linux_status/meta/main.yml new file mode 100644 index 0000000..df1d198 --- /dev/null +++ b/roles/linux_status/meta/main.yml @@ -0,0 +1,6 @@ +dependencies: + - role: ppa + vars: + ppa_owner: egor-tensin + ppa_name: linux-status + ppa_key: ecb69cbafc6d7cd8bd67ec35b1089b3051c9384d diff --git a/roles/linux_status/tasks/main.yml b/roles/linux_status/tasks/main.yml index 17a00d3..6a9f1f1 100644 --- a/roles/linux_status/tasks/main.yml +++ b/roles/linux_status/tasks/main.yml @@ -1,11 +1,3 @@ -- name: Set up repository - ansible.builtin.include_role: - name: ppa - vars: - ppa_owner: egor-tensin - ppa_name: linux-status - ppa_key: ecb69cbafc6d7cd8bd67ec35b1089b3051c9384d - - name: Disable power management when: linux_status_disable_power_management become: true diff --git a/roles/wireguard/meta/main.yml b/roles/wireguard/meta/main.yml new file mode 100644 index 0000000..4f84662 --- /dev/null +++ b/roles/wireguard/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - role: router + when: wg_router diff --git a/roles/wireguard/tasks/main.yml b/roles/wireguard/tasks/main.yml index 279ffd0..f6a09cb 100644 --- a/roles/wireguard/tasks/main.yml +++ b/roles/wireguard/tasks/main.yml @@ -1,8 +1,3 @@ -- name: Set up traffic routing - ansible.builtin.include_role: - name: router - when: wg_router - - name: Set up Wireguard become: true block: -- cgit v1.2.3