opendev/puppet-openstackci
Code Issues Proposed changes

Merge "Migrate to puppet-httpd module"

Browse Source
This commit is contained in:
Jenkins 2015-07-27 16:05:44 +00:00 committed by Gerrit Code Review
commit c582dad517
2 changed files with 71 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
manifests/logserver.pp
View File

@ -32,24 +32,81 @@ class openstackci::logserver (
}
}
include apache
include apache::mod::wsgi
# NOTE(pabelanger): Until we full remove puppetlabs-apache from
# system-config, we need to do this hack to avoid a circular dependency.
if ! defined(Class['::apache']) {
include ::httpd
include ::httpd::mod::wsgi
if ! defined(A2mod['rewrite']) {
a2mod { 'rewrite':
ensure => present,
if ! defined(Httpd_mod['rewrite']) {
httpd_mod { 'rewrite':
ensure => present,
}
}
}
if ! defined(A2mod['proxy']) {
a2mod { 'proxy':
ensure => present,
if ! defined(Httpd_mod['proxy']) {
httpd_mod { 'proxy':
ensure => present,
}
}
}
if ! defined(A2mod['proxy_http']) {
a2mod { 'proxy_http':
ensure => present,
if ! defined(Httpd_mod['proxy_http']) {
httpd_mod { 'proxy_http':
ensure => present,
}
}
::httpd::vhost { "logs.${domain}":
port => 80,
priority => '50',
docroot => '/srv/static/logs',
require => File['/srv/static/logs'],
template => 'openstackci/logs.vhost.erb',
}
::httpd::vhost { "logs-dev.${domain}":
port => 80,
priority => '51',
docroot => '/srv/static/logs',
require => File['/srv/static/logs'],
template => 'openstackci/logs-dev.vhost.erb',
}
} else {
include apache
include apache::mod::wsgi
if ! defined(A2mod['rewrite']) {
a2mod { 'rewrite':
ensure => present,
}
}
if ! defined(A2mod['proxy']) {
a2mod { 'proxy':
ensure => present,
}
}
if ! defined(A2mod['proxy_http']) {
a2mod { 'proxy_http':
ensure => present,
}
}
apache::vhost { "logs.${domain}":
port => 80,
priority => '50',
docroot => '/srv/static/logs',
require => File['/srv/static/logs'],
template => 'openstackci/logs.vhost.erb',
}
apache::vhost { "logs-dev.${domain}":
port => 80,
priority => '51',
docroot => '/srv/static/logs',
require => File['/srv/static/logs'],
template => 'openstackci/logs-dev.vhost.erb',
}
}
@ -59,22 +116,6 @@ class openstackci::logserver (
}
}
apache::vhost { "logs.${domain}":
port => 80,
priority => '50',
docroot => '/srv/static/logs',
require => File['/srv/static/logs'],
template => 'openstackci/logs.vhost.erb',
}
apache::vhost { "logs-dev.${domain}":
port => 80,
priority => '51',
docroot => '/srv/static/logs',
require => File['/srv/static/logs'],
template => 'openstackci/logs-dev.vhost.erb',
}
file { '/srv/static/logs':
ensure => directory,
owner => 'jenkins',

2
metadata.json
View File

@ -8,7 +8,7 @@
"project_page": "http://docs.openstack.org/infra/system-config/",
"issues_url": "https://storyboard.openstack.org/#!/project/808",
"dependencies": [
{ "name": "puppetlabs/apache" },
{ "name": "openstackinfra/httpd" },
{ "name": "openstackinfra/vcsrepo" },
{ "name": "openstackinfra/jenkins" },
{ "name": "openstackinfra/zuul" },