summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Antyshev <eantyshev@virtuozzo.com>2015-12-04 17:12:23 +0000
committerEvgeny Antyshev <eantyshev@virtuozzo.com>2015-12-08 15:00:14 +0000
commit4e1b8cd90a792b8ad009dfe61d40faff54246122 (patch)
treea375b75876bd6822df6388124a3534c3755c8eda
parentd665784f9e4b9c0a1859ae654bf8ba52c725f2f6 (diff)
Use httpd::mod instead of httpd_mod
httpd::mod is a high-level wrapper around httpd_mod, and, since it is used, e.g. in puppet-jenkins and puppet-zuul, it should be uniform across all puppet projects, to be able to properly detect whether Httpd_mod instance defined, like below: if (! defined(Httpd::Mod['rewrite'])) { httpd::mod { 'rewrite': ensure => present } } Change-Id: I2b453b6f15d80bba9b1c29bc0d35651cfae05427 Depends-On: I69e7f9c54d06d7f98b50fdc7d5a67dd10e3e0050
Notes
Notes (review): Code-Review+1: Ramy Asselin <ramy.asselin@hpe.com> Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 21 Dec 2015 18:18:57 +0000 Reviewed-on: https://review.openstack.org/253619 Project: openstack-infra/system-config Branch: refs/heads/master
-rw-r--r--modules/openstack_project/manifests/cacti.pp6
-rw-r--r--modules/openstack_project/manifests/eavesdrop.pp6
-rw-r--r--modules/openstack_project/manifests/grafana.pp20
-rw-r--r--modules/openstack_project/manifests/static.pp20
-rw-r--r--modules/openstack_project/manifests/status.pp20
5 files changed, 50 insertions, 22 deletions
diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp
index 44a5ac2..262f943 100644
--- a/modules/openstack_project/manifests/cacti.pp
+++ b/modules/openstack_project/manifests/cacti.pp
@@ -14,8 +14,10 @@ class openstack_project::cacti (
14 14
15 include ::httpd 15 include ::httpd
16 16
17 httpd_mod { 'rewrite': 17 if ! defined(Httpd::Mod['rewrite']) {
18 ensure => present, 18 httpd::mod { 'rewrite':
19 ensure => present,
20 }
19 } 21 }
20 22
21 package { 'cacti': 23 package { 'cacti':
diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp
index a0957ec..6ff57f2 100644
--- a/modules/openstack_project/manifests/eavesdrop.pp
+++ b/modules/openstack_project/manifests/eavesdrop.pp
@@ -140,8 +140,10 @@ class openstack_project::eavesdrop (
140 require => Class['statusbot'], 140 require => Class['statusbot'],
141 } 141 }
142 142
143 httpd_mod { 'headers': 143 if ! defined(Httpd::Mod['headers']) {
144 ensure => present, 144 httpd::mod { 'headers':
145 ensure => present,
146 }
145 } 147 }
146 148
147 class { 'project_config': 149 class { 'project_config':
diff --git a/modules/openstack_project/manifests/grafana.pp b/modules/openstack_project/manifests/grafana.pp
index e83e783..220d4c6 100644
--- a/modules/openstack_project/manifests/grafana.pp
+++ b/modules/openstack_project/manifests/grafana.pp
@@ -70,14 +70,22 @@ class openstack_project::grafana (
70 template => 'openstack_project/grafana.vhost.erb', 70 template => 'openstack_project/grafana.vhost.erb',
71 } 71 }
72 72
73 httpd_mod { 'rewrite': 73 if ! defined(Httpd::Mod['rewrite']) {
74 ensure => present, 74 httpd::mod { 'rewrite':
75 ensure => present,
76 }
75 } 77 }
76 httpd_mod { 'proxy': 78
77 ensure => present, 79 if ! defined(Httpd::Mod['proxy']) {
80 httpd::mod { 'proxy':
81 ensure => present,
82 }
78 } 83 }
79 httpd_mod { 'proxy_http': 84
80 ensure => present, 85 if ! defined(Httpd::Mod['proxy_http']) {
86 httpd::mod { 'proxy_http':
87 ensure => present,
88 }
81 } 89 }
82 90
83 class { '::project_config': 91 class { '::project_config':
diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp
index 4133e21..55585ec 100644
--- a/modules/openstack_project/manifests/static.pp
+++ b/modules/openstack_project/manifests/static.pp
@@ -31,14 +31,22 @@ class openstack_project::static (
31 include ::httpd 31 include ::httpd
32 include ::httpd::mod::wsgi 32 include ::httpd::mod::wsgi
33 33
34 httpd_mod { 'rewrite': 34 if ! defined(Httpd::Mod['rewrite']) {
35 ensure => present, 35 httpd::mod { 'rewrite':
36 ensure => present,
37 }
36 } 38 }
37 httpd_mod { 'proxy': 39
38 ensure => present, 40 if ! defined(Httpd::Mod['proxy']) {
41 httpd::mod { 'proxy':
42 ensure => present,
43 }
39 } 44 }
40 httpd_mod { 'proxy_http': 45
41 ensure => present, 46 if ! defined(Httpd::Mod['proxy_http']) {
47 httpd::mod { 'proxy_http':
48 ensure => present,
49 }
42 } 50 }
43 51
44 if ! defined(File['/srv/static']) { 52 if ! defined(File['/srv/static']) {
diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp
index 873e1de..b9c6544 100644
--- a/modules/openstack_project/manifests/status.pp
+++ b/modules/openstack_project/manifests/status.pp
@@ -28,14 +28,22 @@ class openstack_project::status (
28 28
29 include ::httpd 29 include ::httpd
30 30
31 httpd_mod { 'rewrite': 31 if ! defined(Httpd::Mod['rewrite']) {
32 ensure => present, 32 httpd::mod { 'rewrite':
33 ensure => present,
34 }
33 } 35 }
34 httpd_mod { 'proxy': 36
35 ensure => present, 37 if ! defined(Httpd::Mod['proxy']) {
38 httpd::mod { 'proxy':
39 ensure => present,
40 }
36 } 41 }
37 httpd_mod { 'proxy_http': 42
38 ensure => present, 43 if ! defined(Httpd::Mod['proxy_http']) {
44 httpd::mod { 'proxy_http':
45 ensure => present,
46 }
39 } 47 }
40 48
41 file { '/srv/static': 49 file { '/srv/static':