diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-24 17:51:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-24 17:51:43 +0000 |
| commit | 19e44d2a61d31982b76e3ac9d0e8bb90f9ca57e1 (patch) | |
| tree | 5a4d2be3503d7cff423bc6b630e2aa68033d74ea /puppet/manifests/overcloud_controller.pp | |
| parent | 1697dc1a54ed8daa43e346bd563de9ae9a051710 (diff) | |
| parent | 2018c38ed41fe4ffcdc128081218ee6e688bd4fc (diff) | |
Merge "Deploy Aodh services, replacing Ceilometer Alarm"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index a4d4784b..5b3e8f77 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -123,6 +123,7 @@ if hiera('step') >= 2 { include ::sahara::db::mysql if downcase(hiera('ceilometer_backend')) == 'mysql' { include ::ceilometer::db::mysql + include ::aodh::db::mysql } $rabbit_nodes = hiera('rabbit_node_ips') @@ -610,6 +611,21 @@ if hiera('step') >= 3 { Cron <| title == 'ceilometer-expirer' |> { command => "sleep $((\$(od -A n -t d -N 3 /dev/urandom) % 86400)) && ${::ceilometer::params::expirer_command}" } + # Aodh + class { '::aodh' : + database_connection => $ceilometer_database_connection, + } + 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 + include ::aodh::evaluator + include ::aodh::notifier + include ::aodh::listener + include ::aodh::client + # Heat class { '::heat' : notification_driver => 'messaging', |