opendev/system-config
Code Issues Proposed changes

Merge "Revert "move to elastic-recheck web console in share""

Browse Source
This commit is contained in:
Jenkins 2013-12-05 19:54:30 +00:00 committed by Gerrit Code Review
commit c26b09021f
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/elastic_recheck/manifests/init.pp
View File

@ -62,14 +62,6 @@ class elastic_recheck (
require => User['recheck'], require => User['recheck'],
} }
file { '/var/lib/elastic-recheck':
ensure => directory,
mode => '0755',
owner => 'recheck',
group => 'recheck',
require => User['recheck'],
}
file { '/var/log/elastic-recheck': file { '/var/log/elastic-recheck':
ensure => directory, ensure => directory,
mode => '0755', mode => '0755',

21
modules/openstack_project/manifests/static.pp
View File

@ -8,7 +8,7 @@ class openstack_project::static (
$releasestatus_prvkey_contents = '', $releasestatus_prvkey_contents = '',
$releasestatus_pubkey_contents = '', $releasestatus_pubkey_contents = '',
$releasestatus_gerrit_ssh_key = '', $releasestatus_gerrit_ssh_key = '',
$er_state_dir = '/var/lib/elastic-recheck', $er_state_dir = '/srv/static/status/elastic-recheck',
) { ) {
class { 'openstack_project::server': class { 'openstack_project::server':
@ -344,6 +344,25 @@ class openstack_project::static (
require => Class['pip'], require => Class['pip'],
} }
file { '/srv/static/status/elastic-recheck':
ensure => directory,
owner => 'recheck',
group => 'recheck',
require => User['recheck'],
}
file { '/srv/static/status/elastic-recheck/index.html':
ensure => present,
source => 'puppet:///modules/openstack_project/elastic-recheck/elastic-recheck.html',
require => File['/srv/static/status/elastic-recheck'],
}
file { '/srv/static/status/elastic-recheck/elastic-recheck.js':
ensure => present,
source => 'puppet:///modules/openstack_project/elastic-recheck/elastic-recheck.js',
require => File['/srv/static/status/elastic-recheck'],
}
cron { 'elastic-recheck': cron { 'elastic-recheck':
user => 'recheck', user => 'recheck',
minute => '*/15', minute => '*/15',

16
modules/openstack_project/templates/status.vhost.erb
View File

@ -38,22 +38,6 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
allow from all allow from all
</Directory> </Directory>
# Sample elastic-recheck config file, adjust prefixes
# per your local configuration
Alias /elastic-recheck /usr/local/share/elastic-recheck
<Directory /usr/local/share/elastic-recheck>
Options FollowSymlinks
AllowOverride None
Require all granted
</Directory>
Alias /elastic-recheck/data /var/lib/elastic-recheck
<Directory /var/lib/elastic-recheck>
Options FollowSymlinks
AllowOverride None
Require all granted
</Directory>
ErrorLog /var/log/apache2/<%= name %>_error.log ErrorLog /var/log/apache2/<%= name %>_error.log
LogLevel warn LogLevel warn
CustomLog /var/log/apache2/<%= name %>_access.log combined CustomLog /var/log/apache2/<%= name %>_access.log combined