From ec9c22ca6a376b7d1139a384dcb78f3f5bb5b607 Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Fri, 18 Nov 2016 14:26:02 -0500
Subject: Refactored to use Ansible systemd module

* Ansible systemd module used in place of service module
* Refactored command tasks which are no longer necessary
* Applying rules from openshift-ansible Best Practices Guide
---
 roles/dns/README.md         | 2 +-
 roles/dns/handlers/main.yml | 3 ++-
 roles/dns/meta/main.yml     | 1 +
 roles/dns/tasks/main.yml    | 9 ++-------
 4 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'roles/dns')

diff --git a/roles/dns/README.md b/roles/dns/README.md
index 7e0140772..9a88ce97c 100644
--- a/roles/dns/README.md
+++ b/roles/dns/README.md
@@ -6,7 +6,7 @@ Configure a DNS server serving IPs of all the nodes of the cluster
 Requirements
 ------------
 
-None
+Ansible 2.2
 
 Role Variables
 --------------
diff --git a/roles/dns/handlers/main.yml b/roles/dns/handlers/main.yml
index ef101785e..61fd7a10e 100644
--- a/roles/dns/handlers/main.yml
+++ b/roles/dns/handlers/main.yml
@@ -1,4 +1,5 @@
+---
 - name: restart bind
-  service:
+  systemd:
     name: named
     state: restarted
diff --git a/roles/dns/meta/main.yml b/roles/dns/meta/main.yml
index 048274c49..64d56114e 100644
--- a/roles/dns/meta/main.yml
+++ b/roles/dns/meta/main.yml
@@ -4,5 +4,6 @@ galaxy_info:
   description: Deploy and configure a DNS server
   company: Amadeus SAS
   license: ASL 2.0
+  min_ansible_version: 2.2
 dependencies:
 - { role: openshift_facts }
diff --git a/roles/dns/tasks/main.yml b/roles/dns/tasks/main.yml
index 2abe0d9dd..c5ab53b4d 100644
--- a/roles/dns/tasks/main.yml
+++ b/roles/dns/tasks/main.yml
@@ -11,7 +11,6 @@
   template:
     dest: "/tmp/dockerbuild/Dockerfile"
     src: Dockerfile
-  register: install_result
   when: openshift.common.is_containerized | bool
 
 - name: Build Bind image
@@ -22,13 +21,8 @@
   template:
     dest: "/etc/systemd/system/named.service"
     src: named.service.j2
-  register: install_result
   when: openshift.common.is_containerized | bool
 
-- name: reload systemd
-  command: /usr/bin/systemctl --system daemon-reload
-  when: openshift.common.is_containerized | bool and install_result | changed
-
 - name: Create bind zone dir
   file: path=/var/named state=directory
   when: openshift.common.is_containerized | bool
@@ -45,7 +39,8 @@
   notify: restart bind
 
 - name: Enable Bind
-  service:
+  systemd:
     name: named
     state: started
     enabled: yes
+    daemon_reload: yes
-- 
cgit v1.2.3