From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 21 Apr 2017 06:00:55 +0000 (+0000)
Subject: Merge "Move ceilometer wsgi to step 3" into stable/ocata
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=11fbb033092bf1b45b092fc3b349a6f821503ef3;p=apex-puppet-tripleo.git

Merge "Move ceilometer wsgi to step 3" into stable/ocata
---

11fbb033092bf1b45b092fc3b349a6f821503ef3
diff --cc manifests/profile/base/ceilometer/api.pp
index 254cee8,71ea5e7..468f79a
--- a/manifests/profile/base/ceilometer/api.pp
+++ b/manifests/profile/base/ceilometer/api.pp
@@@ -76,9 -76,8 +76,9 @@@ class tripleo::profile::base::ceilomete
      $tls_keyfile = undef
    }
  
-   if $step >= 4 {
+   if $step >= 3 {
      include ::ceilometer::api
 +    include ::apache::mod::ssl
      class { '::ceilometer::wsgi::apache':
        ssl_cert => $tls_certfile,
        ssl_key  => $tls_keyfile,