From 946fd10a84fed8681352be89b5840ad9b5b8880b Mon Sep 17 00:00:00 2001 From: Petr Ospalý Date: Tue, 8 Jan 2019 12:00:20 +0100 Subject: Revert "Fix the problem with ansible_host for ..." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a22f6b34a424d0ce25be7e560d8072a2e84e3ab8. This commit was merged by mistake. Change-Id: Ic73bfd8e9d97c3a23629cba69047cc0edefb9cd0 Issue-ID: OOM-1573 Signed-off-by: Petr Ospalý --- ansible/roles/docker/tasks/main.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'ansible/roles/docker') diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index 7240a14c..9851d4dc 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -16,15 +16,11 @@ path: /etc/docker state: directory -- name: Resolve the ansible_host address to ip - shell: LANG=C ping -n -c1 "{{ hostvars[groups.infrastructure[0]].ansible_host }}" | sed -n 1p | cut -d' ' -f3 | tr -d '()' - register: infra_ipv4 - - name: Setup docker dns settings json_add: path: /etc/docker/daemon.json key: dns - value: "{{ infra_ipv4.stdout }}" + value: "{{ hostvars[groups.infrastructure[0]].ansible_default_ipv4.address }}" notify: - Restart Docker -- cgit 1.2.3-korg