opendev/puppet-nodepool
Code Issues Proposed changes

Migrate to puppet-httpd module

Browse Source 
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: Iedd42f9fb628f1fbf6c4916a5811fd02860f389f
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger
2015-07-16 10:51:08 -04:00
parent 0e6b1a2585
commit 43ff7f00bb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@@ -254,9 +254,9 @@ class nodepool (
if $enable_image_log_via_http == true { if $enable_image_log_via_http == true {
# Setup apache for image log access # Setup apache for image log access
include apache include ::httpd
apache::vhost { $vhost_name: ::httpd::vhost { $vhost_name:
port => 80, port => 80,
priority => '50', priority => '50',
docroot => 'MEANINGLESS_ARGUMENT', docroot => 'MEANINGLESS_ARGUMENT',

6
templates/nodepool-log.vhost.erb
View File

@@ -3,14 +3,14 @@
DocumentRoot <%= scope.lookupvar("nodepool::image_log_document_root") %> DocumentRoot <%= scope.lookupvar("nodepool::image_log_document_root") %>
<Directory <%= scope.lookupvar("nodepool::image_log_document_root") %>> <Directory <%= scope.lookupvar("nodepool::image_log_document_root") %>>
Options <%= scope.lookupvar("apache::params::options") %> Options <%= scope.lookupvar("httpd::params::options") %>
AllowOverride None AllowOverride None
Require all granted Require all granted
</Directory> </Directory>
ErrorLog /var/log/<%= scope.lookupvar("apache::params::apache_name") %>/nodepool_error.log ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/nodepool_error.log
LogLevel warn LogLevel warn
CustomLog /var/log/<%= scope.lookupvar("apache::params::apache_name") %>/nodepool_access.log combined CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/nodepool_access.log combined
ServerSignature Off ServerSignature Off
AddType text/plain .log AddType text/plain .log