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: Ie3d818d172ada2132a0116ce4ce2ed6d231cc005
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2015-07-06 13:40:58 -04:00
parent 2ab8bfa972
commit fd7f94b2ef
4 changed files with 7 additions and 7 deletions

View File

@ -100,7 +100,7 @@ class askbot::install (
require => Python::Virtualenv['/usr/askbot-env'],
}
include ::apache::mod::wsgi
include ::httpd::mod::wsgi
exec { 'askbot-install':
path => [ '/bin', '/sbin' , '/usr/bin', '/usr/sbin', '/usr/local/bin' ],

View File

@ -5,7 +5,7 @@ class askbot::site::http (
$site_name,
$site_template = 'askbot/askbot.vhost.erb',
) {
apache::vhost { $site_name:
::httpd::vhost { $site_name:
port => 80,
priority => 10,
docroot => $site_root,

View File

@ -8,7 +8,7 @@ class askbot::site::ssl (
$site_ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key',
$site_ssl_chain_file = undef,
) {
include ::apache::ssl
include ::httpd::ssl
# site x509 certificate
if $site_ssl_cert_file_contents != undef {
@ -17,7 +17,7 @@ class askbot::site::ssl (
group => 'root',
mode => '0640',
content => $site_ssl_cert_file_contents,
before => Apache::Vhost[$name],
before => Httpd::Vhost[$name],
}
}
@ -28,7 +28,7 @@ class askbot::site::ssl (
group => 'root',
mode => '0640',
content => $site_ssl_key_file_contents,
before => Apache::Vhost[$name],
before => Httpd::Vhost[$name],
}
}
@ -39,7 +39,7 @@ class askbot::site::ssl (
group => 'root',
mode => '0640',
content => $site_ssl_chain_file_contents,
before => Apache::Vhost[$name],
before => Httpd::Vhost[$name],
}
}
}

View File

@ -22,7 +22,7 @@
"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" },
{ "name": "openstackinfra/redis", "version_requirement": "= 0.0.1" },
{ "name": "openstackinfra/vcsrepo", "version_requirement": "= 0.0.1" },
{ "name": "stankevich/python", "version_requirement": "= 1.9.4" }