Merge "Use httpd::mod instead of httpd_mod"

modules/openstack_project/manifests/cacti.pp

@@ -14,8 +14,10 @@ class openstack_project::cacti (
 
   include ::httpd
 
-  httpd_mod { 'rewrite':
-    ensure => present,
+  if ! defined(Httpd::Mod['rewrite']) {
+    httpd::mod { 'rewrite':
+        ensure => present,
+    }
   }
 
   package { 'cacti':

modules/openstack_project/manifests/eavesdrop.pp

@@ -144,8 +144,10 @@ class openstack_project::eavesdrop (
     require => Class['statusbot'],
   }
 
-  httpd_mod { 'headers':
-    ensure => present,
+  if ! defined(Httpd::Mod['headers']) {
+    httpd::mod { 'headers':
+        ensure => present,
+    }
   }
 
   class { 'project_config':

modules/openstack_project/manifests/grafana.pp

@@ -70,14 +70,22 @@ class openstack_project::grafana (
     template => 'openstack_project/grafana.vhost.erb',
   }
 
-  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,
+    }
   }
 
   class { '::project_config':

modules/openstack_project/manifests/static.pp

@@ -31,14 +31,22 @@ class openstack_project::static (
   include ::httpd
   include ::httpd::mod::wsgi
 
-  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,
+    }
   }
 
   if ! defined(File['/srv/static']) {

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':