From 43fdea4ac49488b3e0d96ee5cc01565e51ecc818 Mon Sep 17 00:00:00 2001
From: Monty Taylor
Date: Fri, 24 May 2019 14:55:27 -0500
Subject: [PATCH] Remove bugday from status.o.o
It doesn't seem like this is used anymore. Let's remove it before
we update the rest of this, so that we don't have to, you know,
update abandoned things.
Change-Id: I1c3708021046a428da82eaa843961091915ba4af
---
modules.env | 1 -
modules/openstack_project/files/status/index.html | 8 --------
modules/openstack_project/manifests/status.pp | 11 -----------
modules/openstack_project/templates/status.vhost.erb | 10 ----------
.../openstack_project/templates/status/common.js.erb | 3 +--
5 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/modules.env b/modules.env
index a35597cab5..19c1801907 100644
--- a/modules.env
+++ b/modules.env
@@ -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"
diff --git a/modules/openstack_project/files/status/index.html b/modules/openstack_project/files/status/index.html
index ef8167ceca..a538212fe5 100644
--- a/modules/openstack_project/files/status/index.html
+++ b/modules/openstack_project/files/status/index.html
@@ -83,14 +83,6 @@
-
-
-
- During official bug days, this page is updated with real-time
- stats.
-
-
-
diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp
index d2fda062a4..0bc7f0ed56 100644
--- a/modules/openstack_project/manifests/status.pp
+++ b/modules/openstack_project/manifests/status.pp
@@ -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
diff --git a/modules/openstack_project/templates/status.vhost.erb b/modules/openstack_project/templates/status.vhost.erb
index 481db90071..f1ba1e695f 100644
--- a/modules/openstack_project/templates/status.vhost.erb
+++ b/modules/openstack_project/templates/status.vhost.erb
@@ -12,16 +12,6 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
<% end -%>
DocumentRoot <%= @docroot %>
- Alias /bugday /srv/static/bugdaystats
-
- AllowOverride None
- Order allow,deny
- allow from all
- = 2.4>
- Require all granted
-
-
-
Alias /reviews /srv/static/reviewday
AllowOverride None
diff --git a/modules/openstack_project/templates/status/common.js.erb b/modules/openstack_project/templates/status/common.js.erb
index 73e0adb9a7..a173cdc963 100644
--- a/modules/openstack_project/templates/status/common.js.erb
+++ b/modules/openstack_project/templates/status/common.js.erb
@@ -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(
'