Merge "Move gnocchi wsgi configuration to step 3" into stable/ocata

diff --cc manifests/profile/base/gnocchi/api.pp
index 92431e4,6304a51..029eb99
--- 1/manifests/profile/base/gnocchi/api.pp
--- 2/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@@ -96,9 -96,8 +96,9 @@@ class tripleo::profile::base::gnocchi::
      include ::gnocchi::db::sync
    }
  
-   if $step >= 4 {
+   if $step >= 3 {
      include ::gnocchi::api
 +    include ::apache::mod::ssl
      class { '::gnocchi::wsgi::apache':
        ssl_cert => $tls_certfile,
        ssl_key  => $tls_keyfile,