From a7dbf1c21c89a6eba68dba1799bc2a684a5f49f3 Mon Sep 17 00:00:00 2001
From: Jimmy McCrory <jimmy.mccrory@gmail.com>
Date: Tue, 14 Jun 2016 15:10:01 -0700
Subject: [PATCH] Add missing zone-manager service

Update documentation, default variables, tasks, and environment
inventory to include installation of the designate-zone-manager service.

Change-Id: I1a72cad13e88d962a1e38793a1a3b5b35c0ba8b7
---
 README.rst                       |  1 +
 defaults/main.yml                |  2 ++
 extras/env.d/designate.yml       |  4 ++++
 handlers/main.yml                |  6 ++++++
 tasks/designate_upstart_init.yml | 11 +++++++++++
 tests/inventory                  |  4 ++++
 6 files changed, 28 insertions(+)

diff --git a/README.rst b/README.rst
index 28b9abf..a632047 100644
--- a/README.rst
+++ b/README.rst
@@ -9,6 +9,7 @@ This role will install the following Upstart services:
     * designate-api
     * designate-central
     * designate-pool-manager
+    * designate-zone-manager
     * designate-mdns
     * designate-sink
 
diff --git a/defaults/main.yml b/defaults/main.yml
index f6ecad0..caa6671 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -87,6 +87,7 @@ designate_role_name: admin
 
 designate_central_program_name: designate-central
 designate_pool_manager_program_name: designate-pool-manager
+designate_zone_manager_program_name: designate-zone-manager
 designate_mdns_program_name: designate-mdns
 designate_sink_program_name: designate-sink
 designate_api_program_name: designate-api
@@ -131,6 +132,7 @@ designate_service_names:
   - "designate-api"
   - "designate-central"
   - "designate-pool-manager"
+  - "designate-zone-manager"
   - "designate-mdns"
   - "designate-sink"
 
diff --git a/extras/env.d/designate.yml b/extras/env.d/designate.yml
index 5e2412b..0bf7a38 100644
--- a/extras/env.d/designate.yml
+++ b/extras/env.d/designate.yml
@@ -26,6 +26,9 @@ component_skel:
   designate_pool_manager:
     belongs_to:
       - designate_all
+  designate_zone_manager:
+    belongs_to:
+      - designate_all
   designate_sink:
     belongs_to:
       - designate_all
@@ -39,6 +42,7 @@ container_skel:
       - designate_central
       - designate_mdns
       - designate_pool_manager
+      - designate_zone_manager
       - designate_sink
     properties:
       service_name: designate
diff --git a/handlers/main.yml b/handlers/main.yml
index 8492692..27a9324 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -30,6 +30,12 @@
     state: "restarted"
     pattern: "{{ designate_pool_manager_program_name }}"
 
+- name: Restart designate zone-manager
+  service:
+    name: "{{ designate_zone_manager_program_name }}"
+    state: "restarted"
+    pattern: "{{ designate_zone_manager_program_name }}"
+
 - name: Restart designate mdns
   service:
     name: "{{ designate_mdns_program_name }}"
diff --git a/tasks/designate_upstart_init.yml b/tasks/designate_upstart_init.yml
index 3d0304c..aa50f28 100644
--- a/tasks/designate_upstart_init.yml
+++ b/tasks/designate_upstart_init.yml
@@ -46,6 +46,17 @@
   tags:
     - designate-pool-manager-init
 
+- include: designate_upstart_common_init.yml
+  vars:
+    program_name: "{{ designate_zone_manager_program_name }}"
+    service_name: "{{ designate_service_name }}"
+    system_user: "{{ designate_system_user_name }}"
+    system_group: "{{ designate_system_group_name }}"
+    service_home: "{{ designate_system_user_home }}"
+  when: inventory_hostname in groups['designate_zone_manager']
+  tags:
+    - designate-zone-manager-init
+
 - include: designate_upstart_common_init.yml
   vars:
     program_name: "{{ designate_mdns_program_name }}"
diff --git a/tests/inventory b/tests/inventory
index 4ab6e93..fbf94da 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -15,6 +15,7 @@ designate_api
 designate_central
 designate_mdns
 designate_pool_manager
+designate_zone_manager
 designate_sink
 
 [designate_api]
@@ -29,6 +30,9 @@ openstack1
 [designate_pool_manager]
 openstack1
 
+[designate_zone_manager]
+openstack1
+
 [designate_sink]
 openstack1