opendev/system-config
Code Issues Proposed changes

Migrate to puppet-httpd module

Browse Source 
puppet-httpd is the openstack-infra module for of puppetlabs-apache (0.0.4)
release.

This patchset will remove the puppetlabs-apache namespace from -infra
allow for possible future patchsets to use newer puppetlabs-apache
modules.

Change-Id: Id9f08de5ca32eac884a01f11a2cf34e1044d3048
Depends-On: I4f4648538801a60f45b28cedc73b24d8905cfe14
Depends-On: Ifcc60d173430e30159aa794e5adb5ba71107e647
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2015-07-06 13:05:17 -04:00
parent e48754f3a2
commit dc81e2816f
6 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/manifests/cacti.pp
View File

@ -12,9 +12,9 @@ class openstack_project::cacti (
sysadmins => $sysadmins, sysadmins => $sysadmins,
} }
include apache include ::httpd
a2mod { 'rewrite': httpd_mod { 'rewrite':
ensure => present, ensure => present,
} }

4
modules/openstack_project/manifests/eavesdrop.pp
View File

@ -15,7 +15,7 @@ class openstack_project::eavesdrop (
$accessbot_password = '', $accessbot_password = '',
$project_config_repo = '', $project_config_repo = '',
) { ) {
include apache include ::httpd
include meetbot include meetbot
$vhost_extra = ' $vhost_extra = '
@ -121,7 +121,7 @@ class openstack_project::eavesdrop (
require => Class['statusbot'], require => Class['statusbot'],
} }
a2mod { 'headers': httpd_mod { 'headers':
ensure => present, ensure => present,
} }

6
modules/openstack_project/manifests/puppetboard.pp
View File

@ -7,9 +7,9 @@ class openstack_project::puppetboard(
$port = '80', $port = '80',
) inherits ::puppetboard::params { ) inherits ::puppetboard::params {
include apache include ::httpd
class { 'apache::mod::wsgi': } class { '::httpd::mod::wsgi': }
class { '::puppetboard': class { '::puppetboard':
unresponsive => '1.5', unresponsive => '1.5',
@ -35,7 +35,7 @@ class openstack_project::puppetboard(
# - $group # - $group
# - $port # - $port
# #
apache::vhost { $::fqdn: ::httpd::vhost { $::fqdn:
port => 80, port => 80,
docroot => $docroot, docroot => $docroot,
priority => '50', priority => '50',

4
modules/openstack_project/manifests/pypi_mirror.pp
View File

@ -5,7 +5,7 @@ class openstack_project::pypi_mirror (
$cron_frequency = '*/5', $cron_frequency = '*/5',
) { ) {
include apache include ::httpd
if ! defined(File['/srv/static']) { if ! defined(File['/srv/static']) {
file { '/srv/static': file { '/srv/static':
@ -26,7 +26,7 @@ class openstack_project::pypi_mirror (
require => File['/srv/static/mirror'], require => File['/srv/static/mirror'],
} }
apache::vhost { $vhost_name: ::httpd::vhost { $vhost_name:
port => 80, port => 80,
priority => '50', priority => '50',
docroot => '/srv/static/mirror/web', docroot => '/srv/static/mirror/web',

34
modules/openstack_project/manifests/static.pp
View File

@ -25,16 +25,16 @@ class openstack_project::static (
gitemail => $jenkins_gitemail, gitemail => $jenkins_gitemail,
} }
include apache include ::httpd
include apache::mod::wsgi include ::httpd::mod::wsgi
a2mod { 'rewrite': httpd_mod { 'rewrite':
ensure => present, ensure => present,
} }
a2mod { 'proxy': httpd_mod { 'proxy':
ensure => present, ensure => present,
} }
a2mod { 'proxy_http': httpd_mod { 'proxy_http':
ensure => present, ensure => present,
} }
@ -47,7 +47,7 @@ class openstack_project::static (
########################################################### ###########################################################
# Tarballs # Tarballs
apache::vhost { 'tarballs.openstack.org': ::httpd::vhost { 'tarballs.openstack.org':
port => 80, port => 80,
priority => '50', priority => '50',
docroot => '/srv/static/tarballs', docroot => '/srv/static/tarballs',
@ -64,7 +64,7 @@ class openstack_project::static (
########################################################### ###########################################################
# legacy ci.openstack.org site redirect # legacy ci.openstack.org site redirect
apache::vhost { 'ci.openstack.org': ::httpd::vhost { 'ci.openstack.org':
port => 80, port => 80,
priority => '50', priority => '50',
docroot => 'MEANINGLESS_ARGUMENT', docroot => 'MEANINGLESS_ARGUMENT',
@ -87,7 +87,7 @@ class openstack_project::static (
########################################################### ###########################################################
# Docs-draft # Docs-draft
apache::vhost { 'docs-draft.openstack.org': ::httpd::vhost { 'docs-draft.openstack.org':
port => 80, port => 80,
priority => '50', priority => '50',
docroot => '/srv/static/docs-draft', docroot => '/srv/static/docs-draft',
@ -113,7 +113,7 @@ class openstack_project::static (
########################################################### ###########################################################
# Security # Security
apache::vhost { 'security.openstack.org': ::httpd::vhost { 'security.openstack.org':
port => 443, # Is required despite not being used. port => 443, # Is required despite not being used.
docroot => '/srv/static/security', docroot => '/srv/static/security',
priority => '50', priority => '50',
@ -151,7 +151,7 @@ class openstack_project::static (
mode => '0644', mode => '0644',
content => $security_ssl_cert_file_contents, content => $security_ssl_cert_file_contents,
require => File['/etc/ssl/certs'], require => File['/etc/ssl/certs'],
before => Apache::Vhost['security.openstack.org'], before => Httpd::Vhost['security.openstack.org'],
} }
file { '/etc/ssl/private/security.openstack.org.key': file { '/etc/ssl/private/security.openstack.org.key':
@ -161,7 +161,7 @@ class openstack_project::static (
mode => '0600', mode => '0600',
content => $security_ssl_key_file_contents, content => $security_ssl_key_file_contents,
require => File['/etc/ssl/private'], require => File['/etc/ssl/private'],
before => Apache::Vhost['security.openstack.org'], before => Httpd::Vhost['security.openstack.org'],
} }
file { '/etc/ssl/certs/security.openstack.org_intermediate.pem': file { '/etc/ssl/certs/security.openstack.org_intermediate.pem':
@ -171,13 +171,13 @@ class openstack_project::static (
mode => '0644', mode => '0644',
content => $security_ssl_chain_file_contents, content => $security_ssl_chain_file_contents,
require => File['/etc/ssl/certs'], require => File['/etc/ssl/certs'],
before => Apache::Vhost['security.openstack.org'], before => Httpd::Vhost['security.openstack.org'],
} }
########################################################### ###########################################################
# Governance # Governance
apache::vhost { 'governance.openstack.org': ::httpd::vhost { 'governance.openstack.org':
port => 80, port => 80,
priority => '50', priority => '50',
docroot => '/srv/static/governance', docroot => '/srv/static/governance',
@ -194,7 +194,7 @@ class openstack_project::static (
########################################################### ###########################################################
# Specs # Specs
apache::vhost { 'specs.openstack.org': ::httpd::vhost { 'specs.openstack.org':
port => 80, port => 80,
priority => '50', priority => '50',
docroot => '/srv/static/specs', docroot => '/srv/static/specs',
@ -211,7 +211,7 @@ class openstack_project::static (
########################################################### ###########################################################
# legacy summit.openstack.org site redirect # legacy summit.openstack.org site redirect
apache::vhost { 'summit.openstack.org': ::httpd::vhost { 'summit.openstack.org':
port => 80, port => 80,
priority => '50', priority => '50',
docroot => 'MEANINGLESS_ARGUMENT', docroot => 'MEANINGLESS_ARGUMENT',
@ -221,7 +221,7 @@ class openstack_project::static (
########################################################### ###########################################################
# legacy devstack.org site redirect # legacy devstack.org site redirect
apache::vhost { 'devstack.org': ::httpd::vhost { 'devstack.org':
port => 80, port => 80,
priority => '50', priority => '50',
docroot => 'MEANINGLESS_ARGUMENT', docroot => 'MEANINGLESS_ARGUMENT',
@ -232,7 +232,7 @@ class openstack_project::static (
########################################################### ###########################################################
# Trystack # Trystack
apache::vhost { 'trystack.openstack.org': ::httpd::vhost { 'trystack.openstack.org':
port => 80, port => 80,
priority => '50', priority => '50',
docroot => '/opt/trystack', docroot => '/opt/trystack',

10
modules/openstack_project/manifests/status.pp
View File

@ -25,15 +25,15 @@ class openstack_project::status (
gitemail => $jenkins_gitemail, gitemail => $jenkins_gitemail,
} }
include apache include ::httpd
a2mod { 'rewrite': httpd_mod { 'rewrite':
ensure => present, ensure => present,
} }
a2mod { 'proxy': httpd_mod { 'proxy':
ensure => present, ensure => present,
} }
a2mod { 'proxy_http': httpd_mod { 'proxy_http':
ensure => present, ensure => present,
} }
@ -44,7 +44,7 @@ class openstack_project::status (
########################################################### ###########################################################
# Status - Index # Status - Index
apache::vhost { 'status.openstack.org': ::httpd::vhost { 'status.openstack.org':
port => 80, port => 80,
priority => '50', priority => '50',
docroot => '/srv/static/status', docroot => '/srv/static/status',