Migrate to puppet-httpd module

puppet-httpd is the openstack-infra version of puppetlabs-apache
(0.0.4) release.

This patchset will remove the puppetlabs-apache namespace from -infra
allowing for possible future patchsets to use newer puppetlabs-apache
modules.

Change-Id: I341295e1969b9ff1d54ac84655c1eb340b239684
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

manifests/init.pp

@@ -89,13 +89,13 @@ class drupal (
   $conf_ga_account = undef,
   $conf_openid_provider = undef,
 ) {
-  include apache
+  include ::httpd
   include pear
 
   # ssl certificates
   if $site_ssl_enabled == true {
 
-    include apache::ssl
+    include ::httpd::ssl
 
     # site x509 certificate
     if $site_ssl_cert_file_contents != '' {
@@ -104,7 +104,7 @@ class drupal (
         group   => 'root',
         mode    => '0640',
         content => $site_ssl_cert_file_contents,
-        before  => Apache::Vhost[$site_name],
+        before  => Httpd::Vhost[$site_name],
       }
     }
 
@@ -115,7 +115,7 @@ class drupal (
         group   => 'root',
         mode    => '0640',
         content => $site_ssl_key_file_contents,
-        before  => Apache::Vhost[$site_name],
+        before  => Httpd::Vhost[$site_name],
       }
     }
 
@@ -126,7 +126,7 @@ class drupal (
         group   => 'root',
         mode    => '0640',
         content => $site_ssl_chain_file_contents,
-        before  => Apache::Vhost[$site_name],
+        before  => Httpd::Vhost[$site_name],
       }
     }
   }
@@ -139,7 +139,7 @@ class drupal (
     mode   => '0755',
   }
 
-  apache::vhost { $site_name:
+  ::httpd::vhost { $site_name:
     port     => 80,
     priority => '50',
     docroot  => $site_docroot,
@@ -165,7 +165,7 @@ class drupal (
     require   => File[$site_root],
   }
 
-  a2mod { 'rewrite':
+  httpd_mod { 'rewrite':
     ensure => present,
   }
 

metadata.json

@@ -17,6 +17,6 @@
   "dependencies": [
     { "name": "puppetlabs/stdlib", "version_requirement": ">= 3.2.0" },
     { "name": "puppetlabs/mysql", "version_requirement": "= 0.6.1" },
-    { "name": "puppetlabs/apache", "version_requirement": "= 0.0.4" }
+    { "name": "openstackinfra/httpd", "version_requirement": "0.x" }
   ]
 }