From 4e1b8cd90a792b8ad009dfe61d40faff54246122 Mon Sep 17 00:00:00 2001
From: Evgeny Antyshev <eantyshev@virtuozzo.com>
Date: Fri, 4 Dec 2015 17:12:23 +0000
Subject: [PATCH] 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
---
 modules/openstack_project/manifests/cacti.pp  |  6 ++++--
 .../openstack_project/manifests/eavesdrop.pp  |  6 ++++--
 .../openstack_project/manifests/grafana.pp    | 20 +++++++++++++------
 modules/openstack_project/manifests/static.pp | 20 +++++++++++++------
 modules/openstack_project/manifests/status.pp | 20 +++++++++++++------
 5 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp
index 44a5ac2f68..262f943890 100644
--- a/modules/openstack_project/manifests/cacti.pp
+++ b/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':
diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp
index a0957eca00..6ff57f2191 100644
--- a/modules/openstack_project/manifests/eavesdrop.pp
+++ b/modules/openstack_project/manifests/eavesdrop.pp
@@ -140,8 +140,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':
diff --git a/modules/openstack_project/manifests/grafana.pp b/modules/openstack_project/manifests/grafana.pp
index e83e783649..220d4c6da1 100644
--- a/modules/openstack_project/manifests/grafana.pp
+++ b/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':
diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp
index 4133e21aff..55585ec4e6 100644
--- a/modules/openstack_project/manifests/static.pp
+++ b/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']) {
diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp
index 873e1def13..b9c6544abe 100644
--- a/modules/openstack_project/manifests/status.pp
+++ b/modules/openstack_project/manifests/status.pp
@@ -28,14 +28,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':