From bd438453b8adf4d64e2f15dc1fed52864d8429bf Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 24 Dec 2012 16:11:15 -0800 Subject: [PATCH] Add status.o.o vhost to static.o.o. Add a nice index page. Proxy zuul-related status URLs to zuul.o.o. Proxy release, reviews, and bugday URLs to old-wiki.openstack.org which will point to the current wiki site. This will let us move status.o.o to static.o.o independent of when the individual status pages are moved. Change-Id: I695e281811cd8f6b27025f6626864ed4ea09cae9 Reviewed-on: https://review.openstack.org/18626 Reviewed-by: Monty Taylor Reviewed-by: Jeremy Stanley Approved: James E. Blair Tested-by: Jenkins --- .../openstack_project/files/status/index.html | 161 ++++++++++++++++++ modules/openstack_project/manifests/static.pp | 18 ++ .../templates/status.vhost.erb | 62 +++++++ 3 files changed, 241 insertions(+) create mode 100644 modules/openstack_project/files/status/index.html create mode 100644 modules/openstack_project/templates/status.vhost.erb diff --git a/modules/openstack_project/files/status/index.html b/modules/openstack_project/files/status/index.html new file mode 100644 index 0000000000..a7c58da3f1 --- /dev/null +++ b/modules/openstack_project/files/status/index.html @@ -0,0 +1,161 @@ + + + + + OpenStack Project Status + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+

+

+
+
+
+ +
+ +
+

OpenStack Infrastructure and Project Status

+ +
+

Zuul

+

+ Zuul is the project gating and automation system that tests + and merges changes as well as publishing releases and + documentation. +

+
+
+

Rechecks

+

+ When the cause of a test failure is nondeterministic, + developers can request that it be retested by leaving a + comment in Gerrit of the form "recheck bug #". This page + collects those comments and displays the most commonly seen + bugs. +

+
+
+

Release

+

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

+
+
+

Reviews

+

+ Important reviews are ranked according to blueprint and bug + priority. +

+
+
+

Bugday

+

+ During official bug days, this page is updated with real-time + stats. +

+
+ +
+ +
+
+ +
+ + diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp index 0766d0c05c..fc414dfbba 100644 --- a/modules/openstack_project/manifests/static.pp +++ b/modules/openstack_project/manifests/static.pp @@ -45,6 +45,14 @@ class openstack_project::static ( require => File['/srv/static/docs-draft'], } + apache::vhost { 'status.openstack.org': + port => 80, + priority => '50', + docroot => '/srv/static/status', + template => 'openstack_project/status.vhost.erb', + require => File['/srv/static/status'], + } + file { '/srv/static': ensure => directory, } @@ -92,6 +100,16 @@ class openstack_project::static ( require => File['/srv/static/docs-draft'], } + file { '/srv/static/status': + ensure => directory, + } + + file { '/srv/static/status/index.html': + ensure => present, + source => 'puppet:///modules/openstack_project/status/index.html', + require => File['/srv/static/status'], + } + cron { 'gziplogs': user => 'root', hour => '*/6', diff --git a/modules/openstack_project/templates/status.vhost.erb b/modules/openstack_project/templates/status.vhost.erb new file mode 100644 index 0000000000..10b3711180 --- /dev/null +++ b/modules/openstack_project/templates/status.vhost.erb @@ -0,0 +1,62 @@ +# ************************************ +# Managed by Puppet +# ************************************ + +NameVirtualHost <%= vhost_name %>:<%= port %> +:<%= port %>> + ServerName <%= srvname %> +<% if serveraliases.is_a? Array -%> +<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> +<% elsif serveraliases != '' -%> +<%= " ServerAlias #{serveraliases}" %> +<% end -%> + DocumentRoot <%= docroot %> + + RewriteEngine on + + RewriteRule ^/rechecks$ /rechecks/ [R] + RewriteRule ^/rechecks/$ http://zuul.openstack.org/rechecks.html [P] + + Order allow,deny + Allow from all + + + RewriteRule ^/zuul$ /zuul/ [R] + RewriteRule ^/zuul/(.*)$ http://zuul.openstack.org/$1 [P] + + Order allow,deny + Allow from all + + + RewriteRule ^/release$ /release/ [R] + RewriteRule ^/release/$ http://old-wiki.openstack.org/release/ [P] + + Order allow,deny + Allow from all + + + RewriteRule ^/reviews$ /reviews/ [R] + RewriteRule ^/reviews/$ http://old-wiki.openstack.org/reviews/ [P] + + Order allow,deny + Allow from all + + + RewriteRule ^/bugday$ /bugday/ [R] + RewriteRule ^/bugday/$ http://old-wiki.openstack.org/bugday/ [P] + + Order allow,deny + Allow from all + + + > + Options <%= options %> + AllowOverride None + Order allow,deny + allow from all + + ErrorLog /var/log/apache2/<%= name %>_error.log + LogLevel warn + CustomLog /var/log/apache2/<%= name %>_access.log combined + ServerSignature Off +