From ccfc56ddac0aecffca9b637af88e9aa6a540ea94 Mon Sep 17 00:00:00 2001
From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Tue, 24 Jan 2017 21:57:04 -0500
Subject: [PATCH] Ensure Aodh uses its own mysql db

Until now aodh was just reusing existing ceilo db. Instead
let aodh use its own db. This way we dont have to reply on
ceilo-dbsync for aodh-dbsync to be invoked.

Change-Id: I6e366e862e0b79750de1e993667751c0e1349ada
---

diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 96c84a1..9f2deab 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -186,6 +186,14 @@
   }
 
   # Aodh
+  $aodh_dsn = split(hiera('aodh::db::database_connection'), '[@:/?]')
+  class { '::aodh::db::mysql':
+    user          => $aodh_dsn[3],
+    password      => $aodh_dsn[4],
+    host          => $aodh_dsn[5],
+    dbname        => $aodh_dsn[6],
+    allowed_hosts => $allowed_hosts,
+  }
   include ::aodh
   include ::aodh::api
   include ::aodh::wsgi::apache
@@ -195,8 +203,6 @@
   include ::aodh::client
   include ::aodh::db::sync
   include ::aodh::auth
-  # To manage the upgrade:
-  Exec['ceilometer-dbsync'] -> Exec['aodh-db-sync']
 
   # Gnocchi
   $gnocchi_dsn = split(hiera('gnocchi::db::database_connection'), '[@:/?]')
diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index e559c2f..9a29b22 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -297,8 +297,7 @@
 aodh::api::service_name: 'httpd'
 aodh::wsgi::apache::ssl: false
 aodh::wsgi::apache::bind_host: {{LOCAL_IP}}
-# for a migration path from ceilometer-alarm to aodh, we use the same database
-aodh::db::database_connection: mysql+pymysql://ceilometer:{{UNDERCLOUD_CEILOMETER_PASSWORD}}@{{LOCAL_IP}}/ceilometer
+aodh::db::database_connection: mysql+pymysql://aodh:{{UNDERCLOUD_AODH_PASSWORD}}@{{LOCAL_IP}}/aodh
 aodh::auth::auth_password: {{UNDERCLOUD_AODH_PASSWORD}}
 aodh::keystone::auth::tenant: 'service'
 aodh::keystone::auth::public_url: {{UNDERCLOUD_ENDPOINT_AODH_PUBLIC}}