diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-11-05 09:53:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-11-05 09:53:19 +0000 |
| commit | 618d14d7cf7f9a6499a7bf75ef2c01337d53715c (patch) | |
| tree | 4e6d909ce0fe118f7aa80dc48a3083b092ed00c1 /puppet/manifests | |
| parent | 70e76436e9e2970a352982fac8a78567fffa6cad (diff) | |
| parent | e4ac0fcb9d705aae112145b52e19cf7d0266c7f4 (diff) | |
Merge "Fix dependency for Ceilometer agent when using MySQL"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index e2989184..f8ef7212 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -814,12 +814,11 @@ if hiera('step') >= 3 { } # Ceilometer - $ceilometer_backend = downcase(hiera('ceilometer_backend')) - case $ceilometer_backend { - /mysql/ : { + case downcase(hiera('ceilometer_backend')) { + /mysql/: { $ceilometer_database_connection = hiera('ceilometer_mysql_conn_string') } - default : { + default: { $mongo_node_string = join($mongo_node_ips_with_port, ',') $ceilometer_database_connection = "mongodb://${mongo_node_string}/ceilometer?replicaSet=${mongodb_replset}" } @@ -1282,10 +1281,20 @@ if hiera('step') >= 4 { } # Ceilometer - pacemaker::resource::service { $::ceilometer::params::agent_central_service_name : - clone_params => 'interleave=true', - require => [Pacemaker::Resource::Service[$::keystone::params::service_name], - Pacemaker::Resource::Service[$::mongodb::params::service_name]], + case downcase(hiera('ceilometer_backend')) { + /mysql/: { + pacemaker::resource::service { $::ceilometer::params::agent_central_service_name : + clone_params => 'interleave=true', + require => Pacemaker::Resource::Service[$::keystone::params::service_name], + } + } + default: { + pacemaker::resource::service { $::ceilometer::params::agent_central_service_name : + clone_params => 'interleave=true', + require => [Pacemaker::Resource::Service[$::keystone::params::service_name], + Pacemaker::Resource::Service[$::mongodb::params::service_name]], + } + } } pacemaker::resource::service { $::ceilometer::params::collector_service_name : clone_params => 'interleave=true', |