diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-23 14:36:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-23 14:36:34 +0000 |
| commit | c16ae9c5efdb2f6e3e82f4a6e18d8d5886f2359e (patch) | |
| tree | a353216a9f2bc3d0a9bfcec2e2c81f26ebeb67f0 | |
| parent | b499d17b2a355c7efe4125c9d11f5b262b9dc01d (diff) | |
| parent | 8b5fbc0664cba5f5ac70ff56cb7bdadc32928843 (diff) | |
Merge "Move ceilometer api to run under apache wsgi"
| -rw-r--r-- | manifests/profile/base/ceilometer/api.pp | 5 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/ceilometer.pp | 16 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/ceilometer/api.pp | 5 |
3 files changed, 7 insertions, 19 deletions
diff --git a/manifests/profile/base/ceilometer/api.pp b/manifests/profile/base/ceilometer/api.pp index b300a91..b6419c2 100644 --- a/manifests/profile/base/ceilometer/api.pp +++ b/manifests/profile/base/ceilometer/api.pp @@ -30,6 +30,9 @@ class tripleo::profile::base::ceilometer::api ( if $step >= 4 { include ::ceilometer::api + #NOTE: remove conditional once tht changes are merged + if hiera('ceilometer_wsgi', false) { + include ::ceilometer::wsgi::apache + } } - } diff --git a/manifests/profile/pacemaker/ceilometer.pp b/manifests/profile/pacemaker/ceilometer.pp index 531b4bc..a31128d 100644 --- a/manifests/profile/pacemaker/ceilometer.pp +++ b/manifests/profile/pacemaker/ceilometer.pp @@ -87,22 +87,6 @@ class tripleo::profile::pacemaker::ceilometer ( require => [Pacemaker::Resource::Service[$::ceilometer::params::agent_central_service_name], Pacemaker::Resource::Service[$::ceilometer::params::collector_service_name]], } - pacemaker::constraint::base { 'ceilometer-collector-then-ceilometer-api-constraint': - constraint_type => 'order', - first_resource => "${::ceilometer::params::collector_service_name}-clone", - second_resource => "${::ceilometer::params::api_service_name}-clone", - first_action => 'start', - second_action => 'start', - require => [Pacemaker::Resource::Service[$::ceilometer::params::collector_service_name], - Pacemaker::Resource::Service[$::ceilometer::params::api_service_name]], - } - pacemaker::constraint::colocation { 'ceilometer-api-with-ceilometer-collector-colocation': - source => "${::ceilometer::params::api_service_name}-clone", - target => "${::ceilometer::params::collector_service_name}-clone", - score => 'INFINITY', - require => [Pacemaker::Resource::Service[$::ceilometer::params::api_service_name], - Pacemaker::Resource::Service[$::ceilometer::params::collector_service_name]], - } } } diff --git a/manifests/profile/pacemaker/ceilometer/api.pp b/manifests/profile/pacemaker/ceilometer/api.pp index 0eddaec..169121b 100644 --- a/manifests/profile/pacemaker/ceilometer/api.pp +++ b/manifests/profile/pacemaker/ceilometer/api.pp @@ -34,10 +34,11 @@ class tripleo::profile::pacemaker::ceilometer::api ( include ::ceilometer::params include ::tripleo::profile::pacemaker::ceilometer include ::tripleo::profile::base::ceilometer::api + include ::tripleo::profile::pacemaker::apache if $step >= 5 and downcase($::hostname) == $pacemaker_master { - pacemaker::resource::service { $::ceilometer::params::api_service_name : - clone_params => 'interleave=true', + class { '::tripleo::profile::base::ceilometer::api': + step => $step, } } |