opendev/system-config
Code Issues Proposed changes

Merge "Remove bugday from status.o.o"

Browse Source
This commit is contained in:
Zuul 2019-05-29 15:12:00 +00:00 committed by Gerrit Code Review
commit 598d9106ee
5 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules.env
View File

@ -68,7 +68,6 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-accessbot"]="origin/mast
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ansible"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-askbot"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-asterisk"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-bugdaystats"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-bup"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-cgit"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-diskimage_builder"]="origin/master"

8
modules/openstack_project/files/status/index.html
View File

@ -83,14 +83,6 @@
</p>
</div>
<div class="blurb">
<h2 class="subhead"><a href="/bugday/">Bugday</a></h2>
<p>
During official bug days, this page is updated with real-time
stats.
</p>
</div>
<div class="blurb">
<h2 class="subhead"><a href="/openstack-health/">OpenStack-Health</a></h2>
<p>

11
modules/openstack_project/manifests/status.pp
View File

@ -181,17 +181,6 @@ class openstack_project::status (
reviewday_rsa_key_contents => $reviewday_ssh_private_key,
}
###########################################################
# Status - bugdaystats
include bugdaystats
bugdaystats::site { 'bugdaystats':
git_url => 'https://opendev.org/openstack/bugdaystats',
serveradmin => 'webmaster@openstack.org',
httproot => '/srv/static/bugdaystats',
configfile => '/var/lib/bugdaystats/config.js',
}
###########################################################
# Status - openstack-health

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

@ -12,16 +12,6 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
<% end -%>
DocumentRoot <%= @docroot %>
Alias /bugday /srv/static/bugdaystats
<Directory /srv/static/bugdaystats>
AllowOverride None
Order allow,deny
allow from all
<IfVersion >= 2.4>
Require all granted
</IfVersion>
</Directory>
Alias /reviews /srv/static/reviewday
<Directory /srv/static/reviewday>
AllowOverride None

3
modules/openstack_project/templates/status/common.js.erb
View File

@ -21,8 +21,7 @@ function header(activeTabName) {
tabsName[1] = 'Zuul'; tabsLink[1] = '<%= @status_base_url %>/zuul/';
tabsName[2] = 'Rechecks'; tabsLink[2] = '<%= @status_base_url %>/elastic-recheck/';
tabsName[3] = 'Reviews'; tabsLink[3] = '<%= @status_base_url %>/reviews/';
tabsName[4] = 'Bugday'; tabsLink[4] = '<%= @status_base_url %>/bugday/';
tabsName[5] = 'OpenStack-Health'; tabsLink[5] = '<%= @status_base_url %>/openstack-health/';
tabsName[4] = 'OpenStack-Health'; tabsLink[4] = '<%= @status_base_url %>/openstack-health/';
document.write(
'<div id="header" class="container">' +