summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-21 18:18:57 +0000
committerGerrit Code Review <review@openstack.org>2015-12-21 18:18:57 +0000
commitc71d6b4496783f50f78e6be44d62801671ead071 (patch)
tree40c5f001873bd6e3af50c3307bdb9245b12b76b9
parentea15a5b4620f85bc0abd1767e5335dde5d832488 (diff)
parent4e1b8cd90a792b8ad009dfe61d40faff54246122 (diff)
Merge "Use httpd::mod instead of httpd_mod"
-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 58176bd..add1d1a 100644
--- a/modules/openstack_project/manifests/eavesdrop.pp
+++ b/modules/openstack_project/manifests/eavesdrop.pp
@@ -144,8 +144,10 @@ class openstack_project::eavesdrop (
144 require => Class['statusbot'], 144 require => Class['statusbot'],
145 } 145 }
146 146
147 httpd_mod { 'headers': 147 if ! defined(Httpd::Mod['headers']) {
148 ensure => present, 148 httpd::mod { 'headers':
149 ensure => present,
150 }
149 } 151 }
150 152
151 class { 'project_config': 153 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 9c14734..babeac4 100644
--- a/modules/openstack_project/manifests/status.pp
+++ b/modules/openstack_project/manifests/status.pp
@@ -26,14 +26,22 @@ class openstack_project::status (
26 26
27 include ::httpd 27 include ::httpd
28 28
29 httpd_mod { 'rewrite': 29 if ! defined(Httpd::Mod['rewrite']) {
30 ensure => present, 30 httpd::mod { 'rewrite':
31 ensure => present,
32 }
31 } 33 }
32 httpd_mod { 'proxy': 34
33 ensure => present, 35 if ! defined(Httpd::Mod['proxy']) {
36 httpd::mod { 'proxy':
37 ensure => present,
38 }
34 } 39 }
35 httpd_mod { 'proxy_http': 40
36 ensure => present, 41 if ! defined(Httpd::Mod['proxy_http']) {
42 httpd::mod { 'proxy_http':
43 ensure => present,
44 }
37 } 45 }
38 46
39 file { '/srv/static': 47 file { '/srv/static':