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
This commit is contained in:
Evgeny Antyshev 2015-12-04 17:12:23 +00:00
parent d665784f9e
commit 4e1b8cd90a
5 changed files with 50 additions and 22 deletions

View File

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

View File

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

View File

@ -70,14 +70,22 @@ class openstack_project::grafana (
template => 'openstack_project/grafana.vhost.erb', template => 'openstack_project/grafana.vhost.erb',
} }
httpd_mod { 'rewrite': if ! defined(Httpd::Mod['rewrite']) {
ensure => present, 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': class { '::project_config':

View File

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

View File

@ -28,14 +28,22 @@ class openstack_project::status (
include ::httpd include ::httpd
httpd_mod { 'rewrite': if ! defined(Httpd::Mod['rewrite']) {
ensure => present, 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': file { '/srv/static':