From e60f04337d05ac4e28425ae38fe10271e8cbc48c Mon Sep 17 00:00:00 2001 From: adamus1red Date: Fri, 31 Dec 2021 15:29:52 +0000 Subject: [PATCH 1/3] Add OS specific variable overrides. Specifically Alpine official repo uses `docker` rather than `docker-ce` or `docker-ee` --- tasks/main.yml | 10 ++++++++++ vars/Alpine.yml | 2 ++ vars/default.yml | 2 ++ 3 files changed, 14 insertions(+) create mode 100755 vars/Alpine.yml create mode 100755 vars/default.yml diff --git a/tasks/main.yml b/tasks/main.yml index 7db3b93..aafabc5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,4 +1,14 @@ --- +- name: Load OS specific package information + include_vars: "{{ lookup('first_found', params) }}" + vars: + params: + files: + - '{{ansible_distribution}}.yml' + - '{{ansible_os_family}}.yml' + - default.yml + paths: + - 'vars' - include_tasks: setup-RedHat.yml when: ansible_os_family == 'RedHat' diff --git a/vars/Alpine.yml b/vars/Alpine.yml new file mode 100755 index 0000000..0cb91f6 --- /dev/null +++ b/vars/Alpine.yml @@ -0,0 +1,2 @@ +--- +docker_package: "docker" diff --git a/vars/default.yml b/vars/default.yml new file mode 100755 index 0000000..805232b --- /dev/null +++ b/vars/default.yml @@ -0,0 +1,2 @@ +--- +# Empty file From f78eb9d639868322166a8810e9562123d6838700 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Fri, 19 Aug 2022 14:09:00 -0500 Subject: [PATCH 2/3] Update tasks/main.yml --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index aafabc5..341534b 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: Load OS specific package information +- name: Load OS-specific vars. include_vars: "{{ lookup('first_found', params) }}" vars: params: From 93eef333bc7be52566ccdb548386994a6957a19c Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Fri, 19 Aug 2022 14:09:04 -0500 Subject: [PATCH 3/3] Update tasks/main.yml --- tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/main.yml b/tasks/main.yml index 341534b..1e46667 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -9,6 +9,7 @@ - default.yml paths: - 'vars' + - include_tasks: setup-RedHat.yml when: ansible_os_family == 'RedHat'