summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Tavares <btavare@thoughtworks.com>2015-09-15 10:08:02 -0300
committerBruno Tavares <btavare@thoughtworks.com>2015-09-28 14:50:03 -0300
commitc180eeac3f61a94de911778e9e59da87545ae034 (patch)
tree209a14d4c1247dc5a4c227e7e6cac03710d19165
parenta6f20165673ad691371dbd1d386e7a1c253fcdb0 (diff)
Use httpd::mod when adding Apache modules.
Replace usage of httpd_mod with the httpd::mod wrapper to allow classes to be applied as well on RedHat systems and have the httpd service ordering fixed. Change-Id: If790efd7b465e77c2eca7710f79e563d69ee3783 Co-Authored-By: Danilo Ramalho <dramalho@thoughtworks.com>
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Code-Review+1: Colleen Murphy <colleen@gazlene.net> Code-Review+1: Glauco Oliveira <gvinici@thoughtworks.com> Submitted-by: Jenkins Submitted-at: Fri, 02 Oct 2015 21:34:45 +0000 Reviewed-on: https://review.openstack.org/223578 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
-rw-r--r--manifests/mod/python.pp2
-rw-r--r--manifests/mod/wsgi.pp2
-rw-r--r--manifests/python.pp2
-rw-r--r--manifests/ssl.pp2
4 files changed, 4 insertions, 4 deletions
diff --git a/manifests/mod/python.pp b/manifests/mod/python.pp
index 0997887..431dbbe 100644
--- a/manifests/mod/python.pp
+++ b/manifests/mod/python.pp
@@ -20,7 +20,7 @@ class httpd::mod::python {
20 require => Package['httpd']; 20 require => Package['httpd'];
21 } 21 }
22 22
23 httpd_mod { 'python': ensure => present; } 23 httpd::mod { 'python': ensure => present; }
24 24
25} 25}
26 26
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index fef40e3..f43641f 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -20,7 +20,7 @@ class httpd::mod::wsgi {
20 require => Package['httpd']; 20 require => Package['httpd'];
21 } 21 }
22 22
23 httpd_mod { 'wsgi': ensure => present; } 23 httpd::mod { 'wsgi': ensure => present; }
24 24
25} 25}
26 26
diff --git a/manifests/python.pp b/manifests/python.pp
index 204e831..faf173f 100644
--- a/manifests/python.pp
+++ b/manifests/python.pp
@@ -20,6 +20,6 @@ class httpd::python {
20 ensure => present, 20 ensure => present,
21 name => $httpd::params::mod_python_package, 21 name => $httpd::params::mod_python_package,
22 } 22 }
23 httpd_mod { 'python': ensure => present, } 23 httpd::mod { 'python': ensure => present, }
24 24
25} 25}
diff --git a/manifests/ssl.pp b/manifests/ssl.pp
index e3abc4c..2e1569a 100644
--- a/manifests/ssl.pp
+++ b/manifests/ssl.pp
@@ -25,7 +25,7 @@ class httpd::ssl {
25 } 25 }
26 } 26 }
27 'ubuntu', 'debian': { 27 'ubuntu', 'debian': {
28 httpd_mod { 'ssl': ensure => present, } 28 httpd::mod { 'ssl': ensure => present, }
29 } 29 }
30 default: { 30 default: {
31 fail( "${::operatingsystem} not defined in httpd::ssl.") 31 fail( "${::operatingsystem} not defined in httpd::ssl.")