diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-27 06:43:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-27 06:43:17 +0000 |
| commit | 6fef3ec59a93c3e4d7e7656ecf5b1dd23b309dd3 (patch) | |
| tree | 0aadef320098fd41d81a67a723a348e477ecb53c /manifests/profile/base | |
| parent | 9d484f93507625f6939c1642f6b34efdcf71ce70 (diff) | |
| parent | 60547b9bfaa60eb2aa379322c61431d8693dc252 (diff) | |
Merge "Remove the ceilo wsgi transient flag"
Diffstat (limited to 'manifests/profile/base')
| -rw-r--r-- | manifests/profile/base/ceilometer/api.pp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/manifests/profile/base/ceilometer/api.pp b/manifests/profile/base/ceilometer/api.pp index b6419c2..da94da2 100644 --- a/manifests/profile/base/ceilometer/api.pp +++ b/manifests/profile/base/ceilometer/api.pp @@ -30,9 +30,6 @@ 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 - } + include ::ceilometer::wsgi::apache } } |