From 22a1d7cba43c1421c9192fcbf60efff3ebb0850f Mon Sep 17 00:00:00 2001
From: Sindhur Malleni <smallen3@ncsu.edu>
Date: Wed, 16 Mar 2016 16:14:24 -0400
Subject: [PATCH] Adding heat to connmon

Change-Id: I631ca1feda00aa4205c426a2e9d0441e5ceddbe0
---
 ansible/install/connmon.yml                  |  1 +
 ansible/install/roles/heat/handlers/main.yml | 31 ++++++++++++++++++++
 ansible/install/roles/heat/tasks/main.yml    | 18 ++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 ansible/install/roles/heat/handlers/main.yml
 create mode 100644 ansible/install/roles/heat/tasks/main.yml

diff --git a/ansible/install/connmon.yml b/ansible/install/connmon.yml
index 45f81d078..d66ed2c41 100644
--- a/ansible/install/connmon.yml
+++ b/ansible/install/connmon.yml
@@ -24,3 +24,4 @@
   - neutron
   - keystone
   - cinder
+  - heat
diff --git a/ansible/install/roles/heat/handlers/main.yml b/ansible/install/roles/heat/handlers/main.yml
new file mode 100644
index 000000000..5e7ef5ab5
--- /dev/null
+++ b/ansible/install/roles/heat/handlers/main.yml
@@ -0,0 +1,31 @@
+---
+#
+## Heat handlers for browbeat install connmon
+##
+#
+- name: unmanage heat services
+  command: pcs resource unmanage {{ item }}
+  with_items:
+    - openstack-heat-api
+    - openstack-heat-engine
+  ignore_errors: true
+
+- name: restart heat services
+  service: name={{ item }} state=restarted
+  with_items:
+    - openstack-heat-api
+    - openstack-heat-engine
+
+- name: manage heat services
+  command: pcs resource manage {{ item }}
+  with_items:
+    - openstack-heat-api
+    - openstack-heat-engine
+  ignore_errors: true
+
+- name: cleanup heat services
+  command: pcs resource cleanup {{ item }}
+  with_items:
+    - openstack-heat-api
+    - openstack-heat-engine
+  ignore_errors: true
diff --git a/ansible/install/roles/heat/tasks/main.yml b/ansible/install/roles/heat/tasks/main.yml
new file mode 100644
index 000000000..11c26ec88
--- /dev/null
+++ b/ansible/install/roles/heat/tasks/main.yml
@@ -0,0 +1,18 @@
+#
+## Heat connmon tasks
+##
+#
+- name: Check for connmon in heat.conf
+  shell: grep -Eq 'connection\s?=\s?mysql:' /etc/heat/heat.conf
+  register: heat_mysql
+  ignore_errors: true
+  changed_when: false
+
+- name: Enable Connmon in heat.conf
+  shell: sed -i 's/mysql:/mysql+connmon:/g' /etc/heat/heat.conf
+  when: heat_mysql.rc == 0
+  notify:
+    - unmanage heat services
+    - restart heat services
+    - manage heat services
+    - cleanup heat services