From 27240c64bc8acab017eb7355a7f9ed03c5a19d6d Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 14 Jul 2015 15:09:26 -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: Id258092e1c1e21800c24512b5bdfee45b0939bca
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 manifests/apache.pp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifests/apache.pp b/manifests/apache.pp
index f6f251b..d0cd422 100644
--- a/manifests/apache.pp
+++ b/manifests/apache.pp
@@ -26,22 +26,22 @@ class zanata::apache (
   $ssl_chain_file_contents = '', # If left empty puppet will not create file.
 ) {
 
-  include ::apache
-  include ::apache::ssl
+  include ::httpd
+  include ::httpd::ssl
 
-  a2mod { 'proxy':
+  httpd_mod { 'proxy':
     ensure => present,
   }
 
-  a2mod { 'proxy_http':
+  httpd_mod { 'proxy_http':
     ensure => present,
   }
 
-  a2mod { 'proxy_ajp':
+  httpd_mod { 'proxy_ajp':
     ensure => present,
   }
 
-  apache::vhost { $vhost_name:
+  ::httpd::vhost { $vhost_name:
     port        => 443,
     docroot     => 'MEANINGLESS ARGUMENT',
     priority    => '50',
@@ -56,7 +56,7 @@ class zanata::apache (
       group   => 'root',
       mode    => '0640',
       content => $ssl_cert_file_contents,
-      before  => Apache::Vhost[$vhost_name],
+      before  => Httpd::Vhost[$vhost_name],
     }
   }
 
@@ -66,7 +66,7 @@ class zanata::apache (
       group   => 'root',
       mode    => '0640',
       content => $ssl_key_file_contents,
-      before  => Apache::Vhost[$vhost_name],
+      before  => Httpd::Vhost[$vhost_name],
     }
   }
 
@@ -76,7 +76,7 @@ class zanata::apache (
       group   => 'root',
       mode    => '0640',
       content => $ssl_chain_file_contents,
-      before  => Apache::Vhost[$vhost_name],
+      before  => Httpd::Vhost[$vhost_name],
     }
   }