opendev
/
puppet-openstackci
Code Issues Proposed changes

logserver: add legacy parameter 

Add legacy parameter for logserver class, to install logserver resources
specific to OpenStack Infra only when needed (true by default for
backward compatibility).

Change-Id: I65e8ecf39130377c088c053e5623212f7db60f7a
This commit is contained in:
Emilien Macchi 2017-07-25 08:24:25 -07:00 committed by Jeremy Stanley
parent 26ad94ec52
commit fdc4e9cc04
3 changed files with 40 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
manifests/logserver.pp
View File

@ -24,6 +24,8 @@ class openstackci::logserver (
$swift_tenant_name = '', $swift_tenant_name = '',
$swift_region_name = '', $swift_region_name = '',
$swift_default_container = '', $swift_default_container = '',
$legacy = true,
$readmes = [],
) { ) {
if ! defined(Class['::jenkins::jenkinsuser']) { if ! defined(Class['::jenkins::jenkinsuser']) {
@ -177,37 +179,39 @@ class openstackci::logserver (
require => File['/etc/os_loganalyze'], require => File['/etc/os_loganalyze'],
} }
vcsrepo { '/opt/devstack-gate': if $legacy {
ensure => latest, vcsrepo { '/opt/devstack-gate':
provider => git, ensure => latest,
revision => 'master', provider => git,
source => 'https://git.openstack.org/openstack-infra/devstack-gate', revision => 'master',
} source => 'https://git.openstack.org/openstack-infra/devstack-gate',
}
file { '/srv/static/logs/help': file { '/srv/static/logs/help':
ensure => directory, ensure => directory,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0755', mode => '0755',
require => File['/srv/static/logs'], require => File['/srv/static/logs'],
} }
file { '/srv/static/logs/help/tempest-logs.html': file { '/srv/static/logs/help/tempest-logs.html':
ensure => present, ensure => present,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0444', mode => '0444',
source => 'file:///opt/devstack-gate/help/tempest-logs.html', source => 'file:///opt/devstack-gate/help/tempest-logs.html',
require => [File['/srv/static/logs/help'], Vcsrepo['/opt/devstack-gate']], require => [File['/srv/static/logs/help'], Vcsrepo['/opt/devstack-gate']],
} }
file { '/srv/static/logs/help/tempest-overview.html': file { '/srv/static/logs/help/tempest-overview.html':
ensure => present, ensure => present,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0444', mode => '0444',
source => 'file:///opt/devstack-gate/help/tempest-overview.html', source => 'file:///opt/devstack-gate/help/tempest-overview.html',
require => [File['/srv/static/logs/help'], Vcsrepo['/opt/devstack-gate']], require => [File['/srv/static/logs/help'], Vcsrepo['/opt/devstack-gate']],
}
} }
file { '/usr/local/sbin/log_archive_maintenance.sh': file { '/usr/local/sbin/log_archive_maintenance.sh':

15
templates/logs-dev.vhost.erb
View File

@ -53,18 +53,11 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
Satisfy Any Satisfy Any
</Directory> </Directory>
<Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*> <% @readmes.each do |pattern| -%>
ReadmeName /help/tempest-overview.html <Directory <%= @docroot %><%= pattern %>>
</Directory> ReadmeName <%= @readmes[pattern] %>
<Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*>
ReadmeName /help/tempest-overview.html
</Directory>
<Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html
</Directory>
<Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html
</Directory> </Directory>
<% end -%>
RewriteEngine On RewriteEngine On
# If the specified file does not exist, look if there is a gzipped version # If the specified file does not exist, look if there is a gzipped version

15
templates/logs.vhost.erb
View File

@ -67,18 +67,11 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
Satisfy Any Satisfy Any
</Directory> </Directory>
<Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*> <% @readmes.each do |pattern| -%>
ReadmeName /help/tempest-overview.html <Directory <%= @docroot %><%= pattern %>>
</Directory> ReadmeName <%= @readmes[pattern] %>
<Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*>
ReadmeName /help/tempest-overview.html
</Directory>
<Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html
</Directory>
<Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html
</Directory> </Directory>
<% end -%>
<Directory <%= @docroot %>/periodic*/*> <Directory <%= @docroot %>/periodic*/*>
IndexOrderDefault Descending Date IndexOrderDefault Descending Date