update apache module to take the 'ssl' parameter, and pass it to the class, this

eliminates a potential variable lookup ordering problem (#2273)

2 files changed, 1 insertions, 2 deletions

diff --git a/puppet/modules/apache b/puppet/modules/apache
-Subproject 6844258b567b5065f5488a12f3f18208ff36ecb
+Subproject 688f07793a72ba4453f6663b6d19fe6388ba382
diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp
index 103e4f35..8b340160 100644
--- a/puppet/modules/site_webapp/manifests/apache.pp
+++ b/puppet/modules/site_webapp/manifests/apache.pp
@@ -12,8 +12,7 @@ class site_webapp::apache {
   $api_cert         = $x509['cert']
   $api_root         = $x509['ca_cert']
 
-  class { '::apache': no_default_site => true }
-  include apache::ssl
+  class { '::apache': no_default_site => true, ssl => true }
 
   apache::module {
     'alias':   ensure => present;