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

diff --cc manifests/profile/base/ceilometer/api.pp
index 254cee8,71ea5e7..468f79a
--- 1/manifests/profile/base/ceilometer/api.pp
--- 2/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,