diff --git a/manifests/site.pp b/manifests/site.pp index 1d693e9c2a..356d7670a3 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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', diff --git a/modules.env b/modules.env index 1afa37fd36..2e800d5967 100644 --- a/modules.env +++ b/modules.env @@ -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" diff --git a/modules/openstack_project/files/status/index.html b/modules/openstack_project/files/status/index.html index 1f9d706165..8fc306acf9 100644 --- a/modules/openstack_project/files/status/index.html +++ b/modules/openstack_project/files/status/index.html @@ -75,14 +75,6 @@

-
-

Release

-

- Blueprints targeted for the next release are tracked on this - page along with overall progress toward completion. -

-
-

Reviews

diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp index 873e1def13..9c147342d0 100644 --- a/modules/openstack_project/manifests/status.pp +++ b/modules/openstack_project/manifests/status.pp @@ -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 diff --git a/modules/openstack_project/templates/status.vhost.erb b/modules/openstack_project/templates/status.vhost.erb index fdee3c24ab..a9537398dd 100644 --- a/modules/openstack_project/templates/status.vhost.erb +++ b/modules/openstack_project/templates/status.vhost.erb @@ -26,8 +26,6 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %> allow from all - Alias /release /srv/static/release - Alias /openstack-health /srv/static/openstack-health AllowOverride None diff --git a/modules/openstack_project/templates/status/common.js.erb b/modules/openstack_project/templates/status/common.js.erb index 7fc954d05d..b4fee555a2 100644 --- a/modules/openstack_project/templates/status/common.js.erb +++ b/modules/openstack_project/templates/status/common.js.erb @@ -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/';