opendev
/
puppet-jenkins
Code Issues Proposed changes

Fix race condition in httpd install and config 

Replaces httpd_mod with httpd::mod to create a relationship with the
httpd service, and only apply the configurations after the modules have
been installed.

This prevents the server to start with an improper configuration and
break the apply.

Change-Id: I0b72a962adfb125caaad5905774114a971c2e4b9
Co-Authored-By: Bruno Tavares <btavare@thoughtworks.com>
Co-Authored-By: Danilo Ramalho <dramalho@thoughtworks.com>
This commit is contained in:
Glauco Oliveira 2015-09-03 13:53:56 -03:00 committed by Maitê Balhester
parent a4992c55d6
commit 9c6b9c0e1d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/master.pp
View File

@ -48,23 +48,23 @@ class jenkins::master(
template => 'jenkins/jenkins.vhost.erb',
ssl => true,
}
if ! defined(Httpd_mod['rewrite']) {
httpd_mod { 'rewrite':
if ! defined(Httpd::Mod['rewrite']) {
httpd::mod { 'rewrite':
ensure => present,
}
}
if ! defined(Httpd_mod['proxy']) {
httpd_mod { 'proxy':
if ! defined(Httpd::Mod['proxy']) {
httpd::mod { 'proxy':
ensure => present,
}
}
if ! defined(Httpd_mod['proxy_http']) {
httpd_mod { 'proxy_http':
if ! defined(Httpd::Mod['proxy_http']) {
httpd::mod { 'proxy_http':
ensure => present,
}
}
if ! defined(Httpd_mod['headers']) {
httpd_mod { 'headers':
if ! defined(Httpd::Mod['headers']) {
httpd::mod { 'headers':
ensure => present,
}
}