Browse Source

Merge "Use httpd::mod instead of httpd_mod"

changes/84/260284/1
Jenkins 3 years ago
parent
commit
c71d6b4496

+ 4
- 2
modules/openstack_project/manifests/cacti.pp View File

@@ -14,8 +14,10 @@ class openstack_project::cacti (
14 14
 
15 15
   include ::httpd
16 16
 
17
-  httpd_mod { 'rewrite':
18
-    ensure => present,
17
+  if ! defined(Httpd::Mod['rewrite']) {
18
+    httpd::mod { 'rewrite':
19
+        ensure => present,
20
+    }
19 21
   }
20 22
 
21 23
   package { 'cacti':

+ 4
- 2
modules/openstack_project/manifests/eavesdrop.pp View File

@@ -144,8 +144,10 @@ class openstack_project::eavesdrop (
144 144
     require => Class['statusbot'],
145 145
   }
146 146
 
147
-  httpd_mod { 'headers':
148
-    ensure => present,
147
+  if ! defined(Httpd::Mod['headers']) {
148
+    httpd::mod { 'headers':
149
+        ensure => present,
150
+    }
149 151
   }
150 152
 
151 153
   class { 'project_config':

+ 14
- 6
modules/openstack_project/manifests/grafana.pp View File

@@ -70,14 +70,22 @@ class openstack_project::grafana (
70 70
     template => 'openstack_project/grafana.vhost.erb',
71 71
   }
72 72
 
73
-  httpd_mod { 'rewrite':
74
-    ensure => present,
73
+  if ! defined(Httpd::Mod['rewrite']) {
74
+    httpd::mod { 'rewrite':
75
+        ensure => present,
76
+    }
75 77
   }
76
-  httpd_mod { 'proxy':
77
-    ensure => present,
78
+
79
+  if ! defined(Httpd::Mod['proxy']) {
80
+    httpd::mod { 'proxy':
81
+        ensure => present,
82
+    }
78 83
   }
79
-  httpd_mod { 'proxy_http':
80
-    ensure => present,
84
+
85
+  if ! defined(Httpd::Mod['proxy_http']) {
86
+    httpd::mod { 'proxy_http':
87
+        ensure => present,
88
+    }
81 89
   }
82 90
 
83 91
   class { '::project_config':

+ 14
- 6
modules/openstack_project/manifests/static.pp View File

@@ -31,14 +31,22 @@ class openstack_project::static (
31 31
   include ::httpd
32 32
   include ::httpd::mod::wsgi
33 33
 
34
-  httpd_mod { 'rewrite':
35
-    ensure => present,
34
+  if ! defined(Httpd::Mod['rewrite']) {
35
+    httpd::mod { 'rewrite':
36
+        ensure => present,
37
+    }
36 38
   }
37
-  httpd_mod { 'proxy':
38
-    ensure => present,
39
+
40
+  if ! defined(Httpd::Mod['proxy']) {
41
+    httpd::mod { 'proxy':
42
+        ensure => present,
43
+    }
39 44
   }
40
-  httpd_mod { 'proxy_http':
41
-    ensure => present,
45
+
46
+  if ! defined(Httpd::Mod['proxy_http']) {
47
+    httpd::mod { 'proxy_http':
48
+        ensure => present,
49
+    }
42 50
   }
43 51
 
44 52
   if ! defined(File['/srv/static']) {

+ 14
- 6
modules/openstack_project/manifests/status.pp View File

@@ -26,14 +26,22 @@ class openstack_project::status (
26 26
 
27 27
   include ::httpd
28 28
 
29
-  httpd_mod { 'rewrite':
30
-    ensure => present,
29
+  if ! defined(Httpd::Mod['rewrite']) {
30
+    httpd::mod { 'rewrite':
31
+        ensure => present,
32
+    }
31 33
   }
32
-  httpd_mod { 'proxy':
33
-    ensure => present,
34
+
35
+  if ! defined(Httpd::Mod['proxy']) {
36
+    httpd::mod { 'proxy':
37
+        ensure => present,
38
+    }
34 39
   }
35
-  httpd_mod { 'proxy_http':
36
-    ensure => present,
40
+
41
+  if ! defined(Httpd::Mod['proxy_http']) {
42
+    httpd::mod { 'proxy_http':
43
+        ensure => present,
44
+    }
37 45
   }
38 46
 
39 47
   file { '/srv/static':

Loading…
Cancel
Save