diff options
| author |   Pradeep Kilambi <pkilambi@redhat.com> | 2016-06-13 13:52:31 -0400 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-06-20 18:06:12 +0000 |
| commit | 8ac333b00467f0ac77b256e908b95173b1fb45bd (patch) | |
| tree | 9ebd81c0ccbaa7c59b4892464d1e9367f4856eae /puppet/manifests | |
| parent | 7b22f2d8305931b8f556f8a6a2d049a9b9ac90a9 (diff) | |
Change Aodh to use own backend
Currently aodh uses ceilometer backend, instead
change it to use its own mysql db.
Change-Id: Idaa879af4e6946e804111d581402e620beb89885
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 6 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 6084c954..431b739d 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -84,8 +84,8 @@ if hiera('step') >= 2 { } if downcase(hiera('ceilometer_backend')) == 'mysql' { include ::ceilometer::db::mysql - include ::aodh::db::mysql } + include ::aodh::db::mysql $enable_ceph = hiera('ceph_storage_count', 0) > 0 or hiera('enable_ceph_storage', false) @@ -280,11 +280,9 @@ if hiera('step') >= 4 { # Aodh class { '::aodh' : - database_connection => $ceilometer_database_connection, + database_connection => hiera('aodh_mysql_conn_string'), } include ::aodh::db::sync - # To manage the upgrade: - Exec['ceilometer-dbsync'] -> Exec['aodh-db-sync'] include ::aodh::auth include ::aodh::api include ::aodh::wsgi::apache diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 13271116..f3308200 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -269,6 +269,10 @@ if hiera('step') >= 2 { require => Exec['galera-ready'], } } + + class { '::aodh::db::mysql': + require => Exec['galera-ready'], + } } # Ceph @@ -520,7 +524,7 @@ MYSQL_HOST=localhost\n", # Aodh class { '::aodh' : - database_connection => $ceilometer_database_connection, + database_connection => hiera('aodh_mysql_conn_string'), } include ::aodh::config include ::aodh::auth |