aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <egor@tensin.name>2024-03-17 15:26:51 +0100
committerEgor Tensin <egor@tensin.name>2024-03-17 15:26:58 +0100
commit45d559454357adb56a21743d8ab958c30a3ab847 (patch)
tree5a52d490a3f35f4a2975d091d683107588d20dec
parentv2.0.4 (diff)
downloadinfra-ansible-45d559454357adb56a21743d8ab958c30a3ab847.tar.gz
infra-ansible-45d559454357adb56a21743d8ab958c30a3ab847.zip
make the mechanism of inclusion of platform-specific vars more uniform
-rw-r--r--roles/docker/tasks/main.yml12
-rw-r--r--roles/docker/vars/Debian.yml (renamed from roles/docker/vars/main.yml)1
l---------roles/docker/vars/Ubuntu.yml1
-rw-r--r--roles/ppa/tasks/main.yml3
4 files changed, 12 insertions, 5 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index a5327e0..26089f3 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,14 +1,20 @@
-- name: Ensure ansible_facts used by role
+- name: Get host distro
ansible.builtin.setup:
- gather_subset: os_family
+ gather_subset:
+ - distribution
+ - distribution_major_version
+ - distribution_release
+ - os_family
- name: Set platform-specific variables
ansible.builtin.include_vars: "{{ __docker_vars_file }}"
loop:
- "{{ ansible_facts['os_family'] }}.yml"
+ - "{{ ansible_facts['distribution'] }}.yml"
+ - "{{ ansible_facts['distribution'] }}_{{ ansible_facts['distribution_major_version'] }}.yml"
vars:
__docker_vars_file: "{{ role_path }}/vars/{{ item }}"
- when: __docker_vars_file is file
+ when: __docker_vars_file is exists
- name: Configure Docker logging driver
when: docker_logging_driver is defined and docker_logging_driver
diff --git a/roles/docker/vars/main.yml b/roles/docker/vars/Debian.yml
index 1a8db5f..5ff84d1 100644
--- a/roles/docker/vars/main.yml
+++ b/roles/docker/vars/Debian.yml
@@ -1,4 +1,3 @@
-# Ubuntu/Debian:
docker_package_names:
- docker.io
- docker-compose
diff --git a/roles/docker/vars/Ubuntu.yml b/roles/docker/vars/Ubuntu.yml
new file mode 120000
index 0000000..4e197bc
--- /dev/null
+++ b/roles/docker/vars/Ubuntu.yml
@@ -0,0 +1 @@
+Debian.yml \ No newline at end of file
diff --git a/roles/ppa/tasks/main.yml b/roles/ppa/tasks/main.yml
index 4a86ced..083acdd 100644
--- a/roles/ppa/tasks/main.yml
+++ b/roles/ppa/tasks/main.yml
@@ -10,10 +10,11 @@
ansible.builtin.include_vars: "{{ __ppa_vars_file }}"
loop:
- "{{ ansible_facts['os_family'] }}.yml"
+ - "{{ ansible_facts['distribution'] }}.yml"
- "{{ ansible_facts['distribution'] }}_{{ ansible_facts['distribution_major_version'] }}.yml"
vars:
__ppa_vars_file: "{{ role_path }}/vars/{{ item }}"
- when: __ppa_vars_file is file
+ when: __ppa_vars_file is exists
- name: Set up PPA repository
ansible.builtin.include_role: