diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-05-04 14:55:18 +0200 |
|---|---|---|
| committer | Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-05-04 15:25:07 +0200 |
| commit | 4fbf064cd826f350174c6f80ee9f4614b5aaf113 (patch) | |
| tree | 16c6234e8a76c423fafa49bae25838d0446ff306 /ansible/roles/docker | |
| parent | ae8a51df158d28e647d551ed02530951715d6a3a (diff) | |
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 <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'ansible/roles/docker')
| -rw-r--r-- | ansible/roles/docker/defaults/main.yml | 2 | ||||
| -rw-r--r-- | 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: |