Merge "Use httpd::mod instead of httpd_mod"

2015-12-21 18:18:57 +00:00
parent ea15a5b462 4e1b8cd90a
commit c71d6b4496
5 changed files with 50 additions and 22 deletions
--- a/modules/openstack_project/manifests/status.pp
+++ b/modules/openstack_project/manifests/status.pp
@@ -26,14 +26,22 @@ class openstack_project::status (

  include ::httpd

-  httpd_mod { 'rewrite':
-    ensure => present,
+  if ! defined(Httpd::Mod['rewrite']) {
+    httpd::mod { 'rewrite':
+        ensure => present,
+    }
  }
-  httpd_mod { 'proxy':
-    ensure => present,
+
+  if ! defined(Httpd::Mod['proxy']) {
+    httpd::mod { 'proxy':
+        ensure => present,
+    }
  }
-  httpd_mod { 'proxy_http':
-    ensure => present,
+
+  if ! defined(Httpd::Mod['proxy_http']) {
+    httpd::mod { 'proxy_http':
+        ensure => present,
+    }
  }

  file { '/srv/static':