Merge "Ensure we configure ssl.conf"

diff --cc manifests/profile/base/ceilometer/api.pp
index 1080355,1aa4285..0176380
--- 1/manifests/profile/base/ceilometer/api.pp
--- 2/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
--- 1/manifests/profile/base/gnocchi/api.pp
--- 2/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,

diff --cc manifests/profile/base/keystone.pp
Simple merge