diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-21 12:51:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-21 12:51:15 +0000 |
| commit | a5399e2310e666ba5489aeccd56e810108e79d96 (patch) | |
| tree | c8608f1c78b86473b232fbb7610d272f44a446f7 /puppet/manifests/overcloud_controller_pacemaker.pp | |
| parent | 2059931c70b8968eccf2a58de48623503b22095b (diff) | |
| parent | 8ac333b00467f0ac77b256e908b95173b1fb45bd (diff) | |
Merge "Change Aodh to use own backend"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 27834cf8..93715bac 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 @@ -517,7 +521,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 |