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: Iff6874b4c9f41c974b03accfbbf7eef6d047fa9b
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

manifests/init.pp

@@ -8,13 +8,13 @@ class lodgeit {
                 'python-simplejson',
                 'python-pygments']
 
-  include apache
+  include ::httpd
 
   include pip
-  a2mod { 'proxy':
+  httpd_mod { 'proxy':
     ensure => present,
   }
-  a2mod { 'proxy_http':
+  httpd_mod { 'proxy_http':
     ensure => present,
   }
 

manifests/site.pp

@@ -9,9 +9,9 @@ define lodgeit::site(
   $vhost_name="paste.${name}.org",
   $image='') {
 
-  include apache
+  include ::httpd
 
-  apache::vhost::proxy { $vhost_name:
+  ::httpd::vhost::proxy { $vhost_name:
     port    => 80,
     dest    => "http://localhost:${port}",
     require => File["/srv/lodgeit/${name}"],
@@ -21,7 +21,7 @@ define lodgeit::site(
     ensure  => present,
     content => template('lodgeit/upstart.erb'),
     replace => true,
-    require => Package[$::apache::params::apache_name],
+    require => Class['httpd'],
     notify  => Service["${name}-paste"],
   }
 
@@ -66,6 +66,6 @@ define lodgeit::site(
   service { "${name}-paste":
     ensure    => running,
     provider  => upstart,
-    require   => Service[$::apache::params::apache_name],
+    require   => Class['httpd'],
   }
 }