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