From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 19 Apr 2017 10:45:55 +0000 (+0000)
Subject: Merge "Ensure we configure ssl.conf"
X-Git-Tag: opnfv-6.0.0~229
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d5471212123fee21cc44175362cf36e9449a2484;p=apex-puppet-tripleo.git

Merge "Ensure we configure ssl.conf"
---

d5471212123fee21cc44175362cf36e9449a2484
diff --cc manifests/profile/base/ceilometer/api.pp
index 1080355,1aa4285..0176380
--- a/manifests/profile/base/ceilometer/api.pp
+++ b/manifests/profile/base/ceilometer/api.pp
@@@ -63,8 -63,9 +63,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,
diff --cc manifests/profile/base/gnocchi/api.pp
index ce04abf,852e3c7..4a47184
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@@ -83,8 -83,9 +83,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,