From 43ff7f00bb2fb33eb735b46b9e2626c466c4c23e Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 16 Jul 2015 10:51:08 -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: Iedd42f9fb628f1fbf6c4916a5811fd02860f389f Signed-off-by: Paul Belanger --- manifests/init.pp | 4 ++-- templates/nodepool-log.vhost.erb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index eb4c387..d7033bf 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -254,9 +254,9 @@ class nodepool ( if $enable_image_log_via_http == true { # Setup apache for image log access - include apache + include ::httpd - apache::vhost { $vhost_name: + ::httpd::vhost { $vhost_name: port => 80, priority => '50', docroot => 'MEANINGLESS_ARGUMENT', diff --git a/templates/nodepool-log.vhost.erb b/templates/nodepool-log.vhost.erb index 700ecbc..eae1505 100644 --- a/templates/nodepool-log.vhost.erb +++ b/templates/nodepool-log.vhost.erb @@ -3,14 +3,14 @@ DocumentRoot <%= scope.lookupvar("nodepool::image_log_document_root") %> > - Options <%= scope.lookupvar("apache::params::options") %> + Options <%= scope.lookupvar("httpd::params::options") %> AllowOverride None Require all granted - 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 - 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 AddType text/plain .log