diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2021-04-12 14:43:06 +0200 |
|---|---|---|
| committer | Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2021-04-13 09:47:55 +0000 |
| commit | b9594d6baad6c570585d0f9b7ea25d82edccfca9 (patch) | |
| tree | 62703ae69f31fad4d955c2763fbb997388305105 /ansible | |
| parent | eadc38f99d6913c9ecf3d0bc2fa57ac1c4ae8008 (diff) | |
[ANSIBLE 3.2.0] Upgrade 'dns' role's tasks to ansible 3.2.0
Change-Id: I6984396d15d0592313978c751fd109ee06d8febf
Issue-ID: OOM-2722
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/library/docker_list_containers.py | 2 | ||||
| -rw-r--r-- | ansible/roles/dns/handlers/main.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/dns/tasks/main.yml | 1 | ||||
| -rw-r--r-- | ansible/test/roles/prepare-dns/tasks/main.yml | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/ansible/library/docker_list_containers.py b/ansible/library/docker_list_containers.py index d8a789c6..2811d6b5 100644 --- a/ansible/library/docker_list_containers.py +++ b/ansible/library/docker_list_containers.py @@ -54,7 +54,7 @@ containers: ] ''' -from ansible.module_utils.docker_common import AnsibleDockerClient +from ansible_collections.community.docker.plugins.module_utils.common import AnsibleDockerClient class DockerListContainers: diff --git a/ansible/roles/dns/handlers/main.yml b/ansible/roles/dns/handlers/main.yml index 201fff70..844a2401 100644 --- a/ansible/roles/dns/handlers/main.yml +++ b/ansible/roles/dns/handlers/main.yml @@ -11,3 +11,4 @@ state: started restart_policy: unless-stopped recreate: true + container_default_behavior: compatibility diff --git a/ansible/roles/dns/tasks/main.yml b/ansible/roles/dns/tasks/main.yml index bfdd83b4..a0e40336 100644 --- a/ansible/roles/dns/tasks/main.yml +++ b/ansible/roles/dns/tasks/main.yml @@ -21,6 +21,7 @@ name: "{{ dns_server_image }}" load_path: "{{ infra_images_path }}/{{ dns_server_image_tar }}" state: present + source: load timeout: 120 notify: Run dns server container diff --git a/ansible/test/roles/prepare-dns/tasks/main.yml b/ansible/test/roles/prepare-dns/tasks/main.yml index 7907f868..d009beb9 100644 --- a/ansible/test/roles/prepare-dns/tasks/main.yml +++ b/ansible/test/roles/prepare-dns/tasks/main.yml @@ -15,6 +15,7 @@ name: andyshinn/dnsmasq tag: 2.76 archive_path: /tmp/dnsmasq.tar + source: pull - name: Copy dnsmasq image to node copy: |