summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/site.pp2
-rw-r--r--modules.env1
-rw-r--r--modules/openstack_project/files/status/index.html8
-rw-r--r--modules/openstack_project/manifests/status.pp26
-rw-r--r--modules/openstack_project/templates/status.vhost.erb2
-rw-r--r--modules/openstack_project/templates/status/common.js.erb2
6 files changed, 17 insertions, 24 deletions
diff --git a/manifests/site.pp b/manifests/site.pp
index 2b914e1..81aba37 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -648,8 +648,6 @@ node 'status.openstack.org' {
648 gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'), 648 gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'),
649 reviewday_ssh_public_key => hiera('reviewday_rsa_pubkey_contents'), 649 reviewday_ssh_public_key => hiera('reviewday_rsa_pubkey_contents'),
650 reviewday_ssh_private_key => hiera('reviewday_rsa_key_contents'), 650 reviewday_ssh_private_key => hiera('reviewday_rsa_key_contents'),
651 releasestatus_ssh_public_key => hiera('releasestatus_rsa_pubkey_contents'),
652 releasestatus_ssh_private_key => hiera('releasestatus_rsa_key_contents'),
653 recheck_ssh_public_key => hiera('elastic-recheck_gerrit_ssh_public_key'), 651 recheck_ssh_public_key => hiera('elastic-recheck_gerrit_ssh_public_key'),
654 recheck_ssh_private_key => hiera('elastic-recheck_gerrit_ssh_private_key'), 652 recheck_ssh_private_key => hiera('elastic-recheck_gerrit_ssh_private_key'),
655 recheck_bot_nick => 'openstackrecheck', 653 recheck_bot_nick => 'openstackrecheck',
diff --git a/modules.env b/modules.env
index a492678..5514e10 100644
--- a/modules.env
+++ b/modules.env
@@ -119,7 +119,6 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-planet"]="origin
119INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-project_config"]="origin/master" 119INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-project_config"]="origin/master"
120INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-redis"]="origin/master" 120INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-redis"]="origin/master"
121INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-refstack"]="origin/master" 121INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-refstack"]="origin/master"
122INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-releasestatus"]="origin/master"
123INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-reviewday"]="origin/master" 122INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-reviewday"]="origin/master"
124INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-simpleproxy"]="origin/master" 123INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-simpleproxy"]="origin/master"
125INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-snmpd"]="origin/master" 124INTEGRATION_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 1f9d706..8fc306a 100644
--- a/modules/openstack_project/files/status/index.html
+++ b/modules/openstack_project/files/status/index.html
@@ -76,14 +76,6 @@
76 </div> 76 </div>
77 77
78 <div class="blurb"> 78 <div class="blurb">
79 <h2 class="subhead"><a href="/release/">Release</a></h2>
80 <p>
81 Blueprints targeted for the next release are tracked on this
82 page along with overall progress toward completion.
83 </p>
84 </div>
85
86 <div class="blurb">
87 <h2 class="subhead"><a href="/reviews/">Reviews</a></h2> 79 <h2 class="subhead"><a href="/reviews/">Reviews</a></h2>
88 <p> 80 <p>
89 Important reviews are ranked according to blueprint and bug 81 Important reviews are ranked according to blueprint and bug
diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp
index 873e1de..9c14734 100644
--- a/modules/openstack_project/manifests/status.pp
+++ b/modules/openstack_project/manifests/status.pp
@@ -5,8 +5,6 @@ class openstack_project::status (
5 $gerrit_ssh_host_key, 5 $gerrit_ssh_host_key,
6 $reviewday_ssh_public_key = '', 6 $reviewday_ssh_public_key = '',
7 $reviewday_ssh_private_key = '', 7 $reviewday_ssh_private_key = '',
8 $releasestatus_ssh_public_key = '',
9 $releasestatus_ssh_private_key = '',
10 $recheck_ssh_public_key, 8 $recheck_ssh_public_key,
11 $recheck_ssh_private_key, 9 $recheck_ssh_private_key,
12 $recheck_bot_passwd, 10 $recheck_bot_passwd,
@@ -232,18 +230,26 @@ class openstack_project::status (
232 } 230 }
233 231
234 ########################################################### 232 ###########################################################
235 # Status - releasestatus 233 # Status - releasestatus (removed)
236 234
237 class { 'releasestatus': 235 file { '/srv/static/release':
238 releasestatus_prvkey_contents => $releasestatus_ssh_private_key, 236 ensure => absent,
239 releasestatus_pubkey_contents => $releasestatus_ssh_public_key, 237 force => yes,
240 releasestatus_gerrit_ssh_key => $gerrit_ssh_host_key,
241 } 238 }
242 239
243 releasestatus::site { 'releasestatus': 240 file { '/var/lib/releasestatus':
244 configfile => 'integrated.yaml', 241 ensure => absent,
245 httproot => '/srv/static/release', 242 force => yes,
246 } 243 }
244
245 user { 'releasestatus':
246 ensure => absent,
247 }
248
249 group { 'releasestatus':
250 ensure => absent,
251 }
252
247 ########################################################### 253 ###########################################################
248 # Status - bugdaystats 254 # Status - bugdaystats
249 255
diff --git a/modules/openstack_project/templates/status.vhost.erb b/modules/openstack_project/templates/status.vhost.erb
index fdee3c2..a953739 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 %>
26 allow from all 26 allow from all
27 </Directory> 27 </Directory>
28 28
29 Alias /release /srv/static/release
30
31 Alias /openstack-health /srv/static/openstack-health 29 Alias /openstack-health /srv/static/openstack-health
32 <Directory /srv/static/openstack-health> 30 <Directory /srv/static/openstack-health>
33 AllowOverride None 31 AllowOverride None
diff --git a/modules/openstack_project/templates/status/common.js.erb b/modules/openstack_project/templates/status/common.js.erb
index 7fc954d..b4fee55 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) {
18 tabsName[0] = 'Status'; tabsLink[0] = '<%= @status_base_url %>'; 18 tabsName[0] = 'Status'; tabsLink[0] = '<%= @status_base_url %>';
19 tabsName[1] = 'Zuul'; tabsLink[1] = '<%= @status_base_url %>/zuul/'; 19 tabsName[1] = 'Zuul'; tabsLink[1] = '<%= @status_base_url %>/zuul/';
20 tabsName[2] = 'Rechecks'; tabsLink[2] = '<%= @status_base_url %>/elastic-recheck/'; 20 tabsName[2] = 'Rechecks'; tabsLink[2] = '<%= @status_base_url %>/elastic-recheck/';
21 tabsName[3] = 'Release'; tabsLink[3] = '<%= @status_base_url %>/release/'; 21 tabsName[3] = 'QA health'; tabsLink[3] = '<%= @status_base_url %>/openstack-health/';
22 tabsName[4] = 'Reviews'; tabsLink[4] = '<%= @status_base_url %>/reviews/'; 22 tabsName[4] = 'Reviews'; tabsLink[4] = '<%= @status_base_url %>/reviews/';
23 tabsName[5] = 'Bugday'; tabsLink[5] = '<%= @status_base_url %>/bugday/'; 23 tabsName[5] = 'Bugday'; tabsLink[5] = '<%= @status_base_url %>/bugday/';
24 24