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 /manifests/profile/base | |
| parent | b499d17b2a355c7efe4125c9d11f5b262b9dc01d (diff) | |
| parent | 8b5fbc0664cba5f5ac70ff56cb7bdadc32928843 (diff) | |
Merge "Move ceilometer api to run under apache wsgi"
Diffstat (limited to 'manifests/profile/base')
| -rw-r--r-- | manifests/profile/base/ceilometer/api.pp | 5 |
1 files changed, 4 insertions, 1 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 + } } - } |