From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Fri, 26 Aug 2016 18:58:05 +0000 (-0400)
Subject: Remove the ceilo wsgi transient flag
X-Git-Tag: opnfv-6.0.0~617^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=60547b9bfaa60eb2aa379322c61431d8693dc252;p=apex-puppet-tripleo.git

Remove the ceilo wsgi transient flag

This was a temporary flag until the tht changes got merged.
Now that the tht changes are merged we can remove this as
params are set for wsgi classes by tht.

Depends-On: I728d0980f7742aa390f11a0f0b8598d1299e2886

Change-Id: I93ea8ebb9053f269de8974880bd33d1b3e487f96
---

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
   }
 }