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

View File

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

View File

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

View File

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