[CORD-2161]
Fix DNS server startup issues with unbound/nsd
Change-Id: I4f1a00da40d10e093077e22bdf95643e11f34836
diff --git a/roles/dns-unbound/tasks/main.yml b/roles/dns-unbound/tasks/main.yml
index a57e9c5..e33a167 100644
--- a/roles/dns-unbound/tasks/main.yml
+++ b/roles/dns-unbound/tasks/main.yml
@@ -1,4 +1,4 @@
-
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,16 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# dns-unbound/tasks/main.yml
----
-#file: roles/dns-unbound/tasks/main.yml
-
-- name: Include OS specific vars
- include_vars: "{{ ansible_os_family }}.yml"
-
-# Debian specific installation
-- include: unbound-Debian.yml
- when: ansible_os_family == 'Debian'
+- name: Install unbound
+ apt:
+ name: "{{ item }}"
+ state: present
+ update_cache: yes
+ cache_valid_time: 3600
+ with_items:
+ - unbound
- name: create unbound.conf from template
template:
@@ -35,3 +35,6 @@
notify:
- restart-unbound
+- name: flush unbound handlers
+ meta: flush_handlers
+
diff --git a/roles/dns-unbound/tasks/unbound-Debian.yml b/roles/dns-unbound/tasks/unbound-Debian.yml
deleted file mode 100644
index 6dd309e..0000000
--- a/roles/dns-unbound/tasks/unbound-Debian.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-
-- name: Install unbound
- apt:
- name={{ item }}
- state=present
- update_cache=yes
- cache_valid_time=3600
- with_items:
- - unbound
-