From c76ae7d9398e3a04ded06c7e54811ad7a379921a Mon Sep 17 00:00:00 2001
From: Jan Provaznik <jprovazn@redhat.com>
Date: Thu, 31 Mar 2016 10:57:30 +0200
Subject: Allow containerized deployment of dns role

If containerized, docker image for bind service is built during
ansible run. The default named systemd unit file triggers
named-checkconf on named service start so it's not neccessary
to include this validation when copying file templates (equivalent
named-checkconf is included in the containerized named unit file too).
---
 roles/dns/tasks/main.yml | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

(limited to 'roles/dns/tasks')

diff --git a/roles/dns/tasks/main.yml b/roles/dns/tasks/main.yml
index af728585d..57a7e6269 100644
--- a/roles/dns/tasks/main.yml
+++ b/roles/dns/tasks/main.yml
@@ -1,18 +1,46 @@
 - name: Install Bind
   action: "{{ ansible_pkg_mgr }} name=bind"
+  when: not openshift.common.is_containerized | bool
+
+- name: Create docker build dir
+  file: path=/tmp/dockerbuild state=directory
+  when: openshift.common.is_containerized | bool
+
+- name: Install dockerfile
+  template:
+    dest: "/tmp/dockerbuild/Dockerfile"
+    src: Dockerfile
+  register: install_result
+  when: openshift.common.is_containerized | bool
+
+- name: Build Bind image
+  docker_image: path="/tmp/dockerbuild" name="bind" state=present
+  when: openshift.common.is_containerized | bool
+
+- name: Install bind service file
+  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
 
 - name: Configure Bind
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
-    validate: "{{ item.validate }}"
   with_items:
     - src: openshift-cluster.zone
       dest: /var/named/openshift-cluster.zone
-      validate: "named-checkzone {{ dns_zones[0] }} %s"
     - src: named.conf
       dest: /etc/named.conf
-      validate: "named-checkconf %s"
   notify: restart bind
 
 - name: Enable Bind
-- 
cgit v1.2.3