diff options
Diffstat (limited to 'roles/core')
| -rw-r--r-- | roles/core/base/tasks/Debian.yml | 15 | ||||
| -rw-r--r-- | roles/core/base/vars/Debian.yml | 2 | ||||
| -rw-r--r-- | roles/core/base/vars/Ubuntu.yml | 2 |
3 files changed, 5 insertions, 14 deletions
diff --git a/roles/core/base/tasks/Debian.yml b/roles/core/base/tasks/Debian.yml index de14e76b..cdcb529e 100644 --- a/roles/core/base/tasks/Debian.yml +++ b/roles/core/base/tasks/Debian.yml @@ -1,12 +1,4 @@ --- -- name: load distrubtion specific variables - include_vars: "{{ item }}" - with_first_found: - - files: - - "{{ ansible_distribution_release }}.yml" - - "{{ ansible_distribution }}.yml" - skip: true - - name: disable recommends, suggests and pdiffs loop: - 02no-recommends @@ -53,7 +45,7 @@ block: - name: install rngd apt: - name: "{{ base_rngd_package_name }}" + name: rng-tools5 state: present - name: make sure haveged is removed/purged @@ -73,7 +65,10 @@ - name: make sure rngd is removed/purged apt: - name: "{{ base_rngd_package_name }}" + name: + - rng-tools + - rng-tools5 + - rng-tools-debian state: absent purge: yes diff --git a/roles/core/base/vars/Debian.yml b/roles/core/base/vars/Debian.yml deleted file mode 100644 index 96baf89b..00000000 --- a/roles/core/base/vars/Debian.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -base_rngd_package_name: rng-tools5 diff --git a/roles/core/base/vars/Ubuntu.yml b/roles/core/base/vars/Ubuntu.yml deleted file mode 100644 index eb2591da..00000000 --- a/roles/core/base/vars/Ubuntu.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -base_rngd_package_name: rng-tools |