[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>

diff --git a/ansible/library/docker_list_containers.py b/ansible/library/docker_list_containers.py
index d8a789c..2811d6b 100644 (file)
--- 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 201fff7..844a240 100644 (file)
--- 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 bfdd83b..a0e4033 100644 (file)
--- 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 7907f86..d009beb 100644 (file)
--- 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: