From 4fbf064cd826f350174c6f80ee9f4614b5aaf113 Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Mon, 4 May 2020 14:55:18 +0200 Subject: Change name of clashing 'packages' variables This fixes a regression from b6455ee: 'packages' variable is injected in 'firewall' role by package_facts module with a higher priority than variable of same name defined in 'docker' roles' defaults. Change-Id: I41e0f992ceaab871ae38fb1b8211fd71c042c9b2 Issue-ID: INT-1578 Signed-off-by: Bartek Grzybowski --- ansible/roles/docker/defaults/main.yml | 2 +- ansible/roles/docker/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/docker/defaults/main.yml b/ansible/roles/docker/defaults/main.yml index 33a86e2d..bf32af7f 100644 --- a/ansible/roles/docker/defaults/main.yml +++ b/ansible/roles/docker/defaults/main.yml @@ -2,7 +2,7 @@ docker: log_max_size: 100m log_max_file: 3 -packages: +custom_packages: RedHat: - python-docker-py - python-jsonpointer diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index 60060826..3ddfa50b 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -10,7 +10,7 @@ package: name: "{{ item }}" state: present - loop: "{{ packages[ansible_os_family] }}" + loop: "{{ custom_packages[ansible_os_family] }}" - name: Ensure /etc/docker exists file: -- cgit 1.2.3-korg