From e8b959a5a210982da0e08b629cf489d64704b6f9 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Thu, 16 Jul 2015 11:06:06 -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: I4f509f1ce72b069ac89d42f2cb55550e3b5bf590
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 manifests/application.pp | 12 ++++++------
 manifests/params.pp      |  6 +++---
 metadata.json            |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/manifests/application.pp b/manifests/application.pp
index e108f82..de2a191 100644
--- a/manifests/application.pp
+++ b/manifests/application.pp
@@ -68,8 +68,8 @@ class storyboard::application (
 
   # Dependencies
   require storyboard::params
-  include apache
-  include apache::mod::wsgi
+  include ::httpd
+  include ::httpd::mod::wsgi
 
   class { 'python':
     pip => true,
@@ -106,7 +106,7 @@ class storyboard::application (
     content => template('storyboard/storyboard.conf.erb'),
     notify  => Service['httpd'],
     require => [
-      Class['apache::params'],
+      Class['httpd::params'],
       File['/etc/storyboard']
     ]
   }
@@ -128,7 +128,7 @@ class storyboard::application (
     subscribe   => Vcsrepo[$src_root_api],
     notify      => Service['httpd'],
     require     => [
-      Class['apache::params'],
+      Class['httpd::params'],
       Class['python::install'],
     ]
   }
@@ -233,7 +233,7 @@ class storyboard::application (
   # Are we setting up TLS or non-TLS?
   if defined(Class['storyboard::cert']) {
     # Set up storyboard as HTTPS
-    apache::vhost { $hostname:
+    ::httpd::vhost { $hostname:
       port     => 443,
       docroot  => $www_root,
       priority => '50',
@@ -242,7 +242,7 @@ class storyboard::application (
     }
   } else {
     # Set up storyboard as HTTPS
-    apache::vhost { $hostname:
+    ::httpd::vhost { $hostname:
       port     => 80,
       docroot  => $www_root,
       priority => '50',
diff --git a/manifests/params.pp b/manifests/params.pp
index 37c5bc2..ada6f02 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -18,10 +18,10 @@
 #
 class storyboard::params () {
 
-  include apache::params
+  include ::httpd::params
 
-  $user = $apache::params::user
-  $group = $apache::params::group
+  $user = $::httpd::params::user
+  $group = $::httpd::params::group
 
   case $::osfamily {
     'Debian': {
diff --git a/metadata.json b/metadata.json
index ecb2321..7ffce30 100644
--- a/metadata.json
+++ b/metadata.json
@@ -17,8 +17,8 @@
       "version_requirement": ">= 0.6.1"
     },
     {
-      "name": "puppetlabs/apache",
-      "version_requirement": "= 0.0.4"
+      "name": "openstackinfra/httpd",
+      "version_requirement": "= 0.x"
     },
     {
       "name": "puppetlabs/rabbitmq",