From fa747a61759546a763adf27e2c36722951c80688 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 14 Jul 2015 15:39:00 -0400
Subject: [PATCH] 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: Iba588ffb565e3c27615f444efeb5a3586cafbd82
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 manifests/init.pp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 1085f9e..3adeaa6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -28,7 +28,7 @@ class graphite(
                 'python-cairo',
                 'nodejs' ]
 
-  include apache
+  include ::httpd
   include pip
 
   package { $packages:
@@ -104,7 +104,7 @@ class graphite(
     ensure  => directory,
     owner   => 'www-data',
     group   => 'www-data',
-    require => [Package[$::apache::params::apache_name],
+    require => [Class['httpd'],
                 File['/var/lib/graphite']]
   }
 
@@ -133,7 +133,7 @@ class graphite(
     ensure  => directory,
     owner   => 'www-data',
     group   => 'www-data',
-    require => Package[$::apache::params::apache_name],
+    require => Class['httpd'],
   }
 
   file { '/var/log/graphite/carbon-cache-a':
@@ -190,20 +190,20 @@ class graphite(
     onlyif  => 'test ! -f /var/lib/graphite/storage/graphite.db',
     require => [ Exec['install_graphite_web'],
       File['/var/lib/graphite'],
-      Package[$::apache::params::apache_name],
+      Class['httpd'],
       File['/usr/local/lib/python2.7/dist-packages/graphite/local_settings.py'],
       File['/usr/local/bin/graphite-init-db.py'],
       File['/etc/graphite/admin.ini']],
   }
 
-  apache::vhost { $vhost_name:
+  ::httpd::vhost { $vhost_name:
     port     => 80,
     priority => '50',
     docroot  => '/var/lib/graphite/webapp',
     template => 'graphite/graphite.vhost.erb',
   }
 
-  a2mod { 'headers':
+  httpd_mod { 'headers':
     ensure => present
   }
 
@@ -266,7 +266,7 @@ class graphite(
     group   => 'www-data',
     content => template('graphite/admin.ini'),
     require => [ File['/etc/graphite'],
-      Package[$::apache::params::apache_name]],
+      Class['httpd']],
   }
 
   file { '/etc/init.d/carbon-cache':