summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Ptacek <m.ptacek@partner.samsung.com>2019-05-21 08:01:33 +0000
committerMichal Ptacek <m.ptacek@partner.samsung.com>2019-05-21 10:49:38 +0000
commitb1fe78553ea7d1caf90c1d52e195cd8f2a082008 (patch)
tree0290d759740afc3ac22adf23253b8ecd0a91295c
parent929d4391d688128f24b44e1bba7b68843263b03f (diff)
Fixing dnsmasq container not starting bug
Two problems are fixed in this commit. Firstly handler is not triggered so dnsmasq is not started. Secondly dns is not working due to loop in dns settings. Change-Id: If6874c99dcc42ef63da167abe8d1f7cdd8e0fcb1 Issue-ID: OOM-1866 Signed-off-by: Michal Ptacek <m.ptacek@partner.samsung.com>
-rw-r--r--ansible/roles/dns/handlers/main.yml2
-rw-r--r--ansible/roles/dns/tasks/main.yml3
2 files changed, 4 insertions, 1 deletions
diff --git a/ansible/roles/dns/handlers/main.yml b/ansible/roles/dns/handlers/main.yml
index 9e957474..cd1e4b47 100644
--- a/ansible/roles/dns/handlers/main.yml
+++ b/ansible/roles/dns/handlers/main.yml
@@ -3,7 +3,7 @@
docker_container:
name: dns-server
image: "{{ dns_server_image }}"
- command: -H /simulated_hosts --log-facility=-
+ command: -H /simulated_hosts --log-facility=- --dns-loop-detect
capabilities: NET_ADMIN
volumes:
- "{{ app_data_path }}/cfg/simulated_hosts:/simulated_hosts:ro"
diff --git a/ansible/roles/dns/tasks/main.yml b/ansible/roles/dns/tasks/main.yml
index 121ee0c4..8a7f8bca 100644
--- a/ansible/roles/dns/tasks/main.yml
+++ b/ansible/roles/dns/tasks/main.yml
@@ -26,3 +26,6 @@
command: /bin/true
notify: Run dns server container
when: "'dns-server' not in containers_list.containers"
+
+- name: Force notified handlers to run at this point
+ meta: flush_handlers