From dc81e2816fb92530befd61026954f99f7da8d64f Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 6 Jul 2015 13:05:17 -0400 Subject: [PATCH] Migrate to puppet-httpd module 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 --- modules/openstack_project/manifests/cacti.pp | 4 +-- .../openstack_project/manifests/eavesdrop.pp | 4 +-- .../manifests/puppetboard.pp | 6 ++-- .../manifests/pypi_mirror.pp | 4 +-- modules/openstack_project/manifests/static.pp | 34 +++++++++---------- modules/openstack_project/manifests/status.pp | 10 +++--- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp index 9da33b67de..b0905cba7e 100644 --- a/modules/openstack_project/manifests/cacti.pp +++ b/modules/openstack_project/manifests/cacti.pp @@ -12,9 +12,9 @@ class openstack_project::cacti ( sysadmins => $sysadmins, } - include apache + include ::httpd - a2mod { 'rewrite': + httpd_mod { 'rewrite': ensure => present, } diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp index 7ab968ad9c..a5c6ef69e4 100644 --- a/modules/openstack_project/manifests/eavesdrop.pp +++ b/modules/openstack_project/manifests/eavesdrop.pp @@ -15,7 +15,7 @@ class openstack_project::eavesdrop ( $accessbot_password = '', $project_config_repo = '', ) { - include apache + include ::httpd include meetbot $vhost_extra = ' @@ -121,7 +121,7 @@ class openstack_project::eavesdrop ( require => Class['statusbot'], } - a2mod { 'headers': + httpd_mod { 'headers': ensure => present, } diff --git a/modules/openstack_project/manifests/puppetboard.pp b/modules/openstack_project/manifests/puppetboard.pp index 250976714e..8f35edf1d2 100644 --- a/modules/openstack_project/manifests/puppetboard.pp +++ b/modules/openstack_project/manifests/puppetboard.pp @@ -7,9 +7,9 @@ class openstack_project::puppetboard( $port = '80', ) inherits ::puppetboard::params { - include apache + include ::httpd - class { 'apache::mod::wsgi': } + class { '::httpd::mod::wsgi': } class { '::puppetboard': unresponsive => '1.5', @@ -35,7 +35,7 @@ class openstack_project::puppetboard( # - $group # - $port # - apache::vhost { $::fqdn: + ::httpd::vhost { $::fqdn: port => 80, docroot => $docroot, priority => '50', diff --git a/modules/openstack_project/manifests/pypi_mirror.pp b/modules/openstack_project/manifests/pypi_mirror.pp index cde1843089..50d9a46686 100644 --- a/modules/openstack_project/manifests/pypi_mirror.pp +++ b/modules/openstack_project/manifests/pypi_mirror.pp @@ -5,7 +5,7 @@ class openstack_project::pypi_mirror ( $cron_frequency = '*/5', ) { - include apache + include ::httpd if ! defined(File['/srv/static']) { file { '/srv/static': @@ -26,7 +26,7 @@ class openstack_project::pypi_mirror ( require => File['/srv/static/mirror'], } - apache::vhost { $vhost_name: + ::httpd::vhost { $vhost_name: port => 80, priority => '50', docroot => '/srv/static/mirror/web', diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp index 72859fb67c..1abff6198f 100644 --- a/modules/openstack_project/manifests/static.pp +++ b/modules/openstack_project/manifests/static.pp @@ -25,16 +25,16 @@ class openstack_project::static ( gitemail => $jenkins_gitemail, } - include apache - include apache::mod::wsgi + include ::httpd + include ::httpd::mod::wsgi - a2mod { 'rewrite': + httpd_mod { 'rewrite': ensure => present, } - a2mod { 'proxy': + httpd_mod { 'proxy': ensure => present, } - a2mod { 'proxy_http': + httpd_mod { 'proxy_http': ensure => present, } @@ -47,7 +47,7 @@ class openstack_project::static ( ########################################################### # Tarballs - apache::vhost { 'tarballs.openstack.org': + ::httpd::vhost { 'tarballs.openstack.org': port => 80, priority => '50', docroot => '/srv/static/tarballs', @@ -64,7 +64,7 @@ class openstack_project::static ( ########################################################### # legacy ci.openstack.org site redirect - apache::vhost { 'ci.openstack.org': + ::httpd::vhost { 'ci.openstack.org': port => 80, priority => '50', docroot => 'MEANINGLESS_ARGUMENT', @@ -87,7 +87,7 @@ class openstack_project::static ( ########################################################### # Docs-draft - apache::vhost { 'docs-draft.openstack.org': + ::httpd::vhost { 'docs-draft.openstack.org': port => 80, priority => '50', docroot => '/srv/static/docs-draft', @@ -113,7 +113,7 @@ class openstack_project::static ( ########################################################### # Security - apache::vhost { 'security.openstack.org': + ::httpd::vhost { 'security.openstack.org': port => 443, # Is required despite not being used. docroot => '/srv/static/security', priority => '50', @@ -151,7 +151,7 @@ class openstack_project::static ( mode => '0644', content => $security_ssl_cert_file_contents, 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': @@ -161,7 +161,7 @@ class openstack_project::static ( mode => '0600', content => $security_ssl_key_file_contents, 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': @@ -171,13 +171,13 @@ class openstack_project::static ( mode => '0644', content => $security_ssl_chain_file_contents, require => File['/etc/ssl/certs'], - before => Apache::Vhost['security.openstack.org'], + before => Httpd::Vhost['security.openstack.org'], } ########################################################### # Governance - apache::vhost { 'governance.openstack.org': + ::httpd::vhost { 'governance.openstack.org': port => 80, priority => '50', docroot => '/srv/static/governance', @@ -194,7 +194,7 @@ class openstack_project::static ( ########################################################### # Specs - apache::vhost { 'specs.openstack.org': + ::httpd::vhost { 'specs.openstack.org': port => 80, priority => '50', docroot => '/srv/static/specs', @@ -211,7 +211,7 @@ class openstack_project::static ( ########################################################### # legacy summit.openstack.org site redirect - apache::vhost { 'summit.openstack.org': + ::httpd::vhost { 'summit.openstack.org': port => 80, priority => '50', docroot => 'MEANINGLESS_ARGUMENT', @@ -221,7 +221,7 @@ class openstack_project::static ( ########################################################### # legacy devstack.org site redirect - apache::vhost { 'devstack.org': + ::httpd::vhost { 'devstack.org': port => 80, priority => '50', docroot => 'MEANINGLESS_ARGUMENT', @@ -232,7 +232,7 @@ class openstack_project::static ( ########################################################### # Trystack - apache::vhost { 'trystack.openstack.org': + ::httpd::vhost { 'trystack.openstack.org': port => 80, priority => '50', docroot => '/opt/trystack', diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp index 45375326f7..74c24c2fcb 100644 --- a/modules/openstack_project/manifests/status.pp +++ b/modules/openstack_project/manifests/status.pp @@ -25,15 +25,15 @@ class openstack_project::status ( gitemail => $jenkins_gitemail, } - include apache + include ::httpd - a2mod { 'rewrite': + httpd_mod { 'rewrite': ensure => present, } - a2mod { 'proxy': + httpd_mod { 'proxy': ensure => present, } - a2mod { 'proxy_http': + httpd_mod { 'proxy_http': ensure => present, } @@ -44,7 +44,7 @@ class openstack_project::status ( ########################################################### # Status - Index - apache::vhost { 'status.openstack.org': + ::httpd::vhost { 'status.openstack.org': port => 80, priority => '50', docroot => '/srv/static/status',