opendev/system-config
Code Issues Proposed changes

Merge "Discontinue Release status page"

Browse Source
This commit is contained in:
Jenkins 2015-12-16 09:40:44 +00:00 committed by Gerrit Code Review
commit 8efba915a9
6 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -648,8 +648,6 @@ node 'status.openstack.org' {
gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'),
reviewday_ssh_public_key => hiera('reviewday_rsa_pubkey_contents'),
reviewday_ssh_private_key => hiera('reviewday_rsa_key_contents'),
releasestatus_ssh_public_key => hiera('releasestatus_rsa_pubkey_contents'),
releasestatus_ssh_private_key => hiera('releasestatus_rsa_key_contents'),
recheck_ssh_public_key => hiera('elastic-recheck_gerrit_ssh_public_key'),
recheck_ssh_private_key => hiera('elastic-recheck_gerrit_ssh_private_key'),
recheck_bot_nick => 'openstackrecheck',

1
modules.env
View File

@ -119,7 +119,6 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-planet"]="origin
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-project_config"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-redis"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-refstack"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-releasestatus"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-reviewday"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-simpleproxy"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-snmpd"]="origin/master"

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

@ -75,14 +75,6 @@
</p>
</div>
<div class="blurb">
<h2 class="subhead"><a href="/release/">Release</a></h2>
<p>
Blueprints targeted for the next release are tracked on this
page along with overall progress toward completion.
</p>
</div>
<div class="blurb">
<h2 class="subhead"><a href="/reviews/">Reviews</a></h2>
<p>

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

@ -5,8 +5,6 @@ class openstack_project::status (
$gerrit_ssh_host_key,
$reviewday_ssh_public_key = '',
$reviewday_ssh_private_key = '',
$releasestatus_ssh_public_key = '',
$releasestatus_ssh_private_key = '',
$recheck_ssh_public_key,
$recheck_ssh_private_key,
$recheck_bot_passwd,
@ -232,18 +230,26 @@ class openstack_project::status (
}
###########################################################
# Status - releasestatus
# Status - releasestatus (removed)
class { 'releasestatus':
releasestatus_prvkey_contents => $releasestatus_ssh_private_key,
releasestatus_pubkey_contents => $releasestatus_ssh_public_key,
releasestatus_gerrit_ssh_key => $gerrit_ssh_host_key,
file { '/srv/static/release':
ensure => absent,
force => yes,
}
releasestatus::site { 'releasestatus':
configfile => 'integrated.yaml',
httproot => '/srv/static/release',
file { '/var/lib/releasestatus':
ensure => absent,
force => yes,
}
user { 'releasestatus':
ensure => absent,
}
group { 'releasestatus':
ensure => absent,
}
###########################################################
# Status - bugdaystats

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

@ -26,8 +26,6 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
allow from all
</Directory>
Alias /release /srv/static/release
Alias /openstack-health /srv/static/openstack-health
<Directory /srv/static/openstack-health>
AllowOverride None

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

@ -18,7 +18,7 @@ function header(activeTabName) {
tabsName[0] = 'Status'; tabsLink[0] = '<%= @status_base_url %>';
tabsName[1] = 'Zuul'; tabsLink[1] = '<%= @status_base_url %>/zuul/';
tabsName[2] = 'Rechecks'; tabsLink[2] = '<%= @status_base_url %>/elastic-recheck/';
tabsName[3] = 'Release'; tabsLink[3] = '<%= @status_base_url %>/release/';
tabsName[3] = 'QA health'; tabsLink[3] = '<%= @status_base_url %>/openstack-health/';
tabsName[4] = 'Reviews'; tabsLink[4] = '<%= @status_base_url %>/reviews/';
tabsName[5] = 'Bugday'; tabsLink[5] = '<%= @status_base_url %>/bugday/';