From: Jenkins Date: Tue, 25 Apr 2017 13:34:50 +0000 (+0000) Subject: Merge "Move gnocchi wsgi configuration to step 3" into stable/ocata X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d3987432f90c1f7c190d94385ad2525fa00ae1d6;p=apex-puppet-tripleo.git Merge "Move gnocchi wsgi configuration to step 3" into stable/ocata --- d3987432f90c1f7c190d94385ad2525fa00ae1d6 diff --cc manifests/profile/base/gnocchi/api.pp index 92431e4,6304a51..029eb99 --- a/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,