From f7711cbcdfd9e0d258d18c84aea4f9fc47048fdb Mon Sep 17 00:00:00 2001
From: Yifei Xue <xueyifei@huawei.com>
Date: Wed, 3 Aug 2016 06:40:51 +0800
Subject: Bug fix for aodh database and conf file

JIRA: COMPASS-447

Change-Id: Ida974260b0e90778d5825be4731f461dd410415a
Signed-off-by: Yifei Xue <xueyifei@huawei.com>
---
 .../roles/aodh/tasks/aodh_config.yml               | 14 ++++++++++
 .../roles/aodh/tasks/aodh_install.yml              | 31 ++++++++++++++++++++++
 .../roles/aodh/tasks/main.yml                      | 28 ++++++++-----------
 3 files changed, 56 insertions(+), 17 deletions(-)
 create mode 100644 deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/tasks/aodh_config.yml
 create mode 100644 deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/tasks/aodh_install.yml

(limited to 'deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/tasks')

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/tasks/aodh_config.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/tasks/aodh_config.yml
new file mode 100644
index 00000000..e60d5338
--- /dev/null
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/tasks/aodh_config.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+- name: aodh db sync
+  shell: su -s /bin/sh -c "aodh-dbsync" aodh
+  notify:
+    - restart aodh services
+
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/tasks/aodh_install.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/tasks/aodh_install.yml
new file mode 100644
index 00000000..eb51fbea
--- /dev/null
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/tasks/aodh_install.yml
@@ -0,0 +1,31 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+- include_vars: "{{ ansible_os_family }}.yml"
+
+- name: install aodh packages
+  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
+  with_items: packages | union(packages_noarch)
+
+- name: update aodh conf
+  template: src={{ item }} dest=/etc/aodh/aodh.conf
+            backup=yes
+  with_items:
+    - aodh.conf.j2
+#    - api_paste.ini.j2
+#    - policy.json.j2
+  notify:
+    - restart aodh services
+
+- name: write services to monitor list
+  lineinfile: dest=/opt/service create=yes line='{{ item }}'
+  with_items: services | union(services_noarch)
+
+- name: remove default sqlite db
+  shell: rm /var/lib/aodh/aodh.sqlite || touch aodh.sqllite.db.removed
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/tasks/main.yml
index 75b15511..9b61915f 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/tasks/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/tasks/main.yml
@@ -7,23 +7,17 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
-- include_vars: "{{ ansible_os_family }}.yml"
+- include: aodh_install.yml
+  tags:
+    - install
+    - aodh_install
+    - aodh
 
-- name: install aodh packages
-  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  with_items: packages | union(packages_noarch)
-
-- name: update aodh conf
-  template: src={{ item }} dest=/etc/aodh/aodh.conf
-            backup=yes
-  with_items:
-    - aodh.conf.j2
-#    - api_paste.ini.j2
-#    - policy.json.j2
-  notify: restart aodh services
-
-- name: write services to monitor list
-  lineinfile: dest=/opt/service create=yes line='{{ item }}'
-  with_items: services
+- include: aodh_config.yml
+  when: inventory_hostname == groups['controller'][0]
+  tags:
+    - config
+    - aodh_config
+    - aodh
 
 - meta: flush_handlers
-- 
cgit 1.2.3-korg