openstack
/
instack-undercloud
Code Issues Proposed changes

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
This commit is contained in:
Pradeep Kilambi 2017-01-24 21:57:04 -05:00
parent 2aa658588a
commit ccfc56ddac
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
elements/puppet-stack-config/puppet-stack-config.pp
View File

@ -186,6 +186,14 @@ if str2bool(hiera('enable_telemetry', true)) {
}
# 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 @@ if str2bool(hiera('enable_telemetry', true)) {
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'), '[@:/?]')

3
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@ -297,8 +297,7 @@ aodh::keystone::authtoken::auth_url: "%{hiera('keystone_identity_uri')}"
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}}