Move zuul status to static.o.o.

And update the status page to use common.js. Redirect old zuul status urls to status.o.o. Change-Id: I98e86eb78b70d5cbe53410919642f302e9709d19 Reviewed-on: https://review.openstack.org/25664 Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Approved: James E. Blair <corvus@inaugust.com> Tested-by: Jenkins
2013-03-28 15:09:28 -07:00 · 2013-03-28 15:09:28 -07:00 · 35b8274533
parent d8184191da
commit 35b8274533
5 changed files with 87 additions and 104 deletions
--- a/modules/openstack_project/files/zuul/status.html
+++ b/modules/openstack_project/files/zuul/status.html
@ -66,11 +66,16 @@ a:link {

    <TITLE>Zuul Status</TITLE>

-<script type="text/javascript" src="jquery.min.js"></script>
-<script type="text/javascript" src="jquery-visibility.min.js"></script>
-<script type="text/javascript" src="jquery-graphite.js"></script>
-<script type="text/javascript" src="status.js"></script>
-
+<script type="text/javascript"
+	src="http://status.openstack.org/jquery.min.js"></script>
+<script type="text/javascript"
+	src="http://status.openstack.org/jquery-visibility.min.js"></script>
+<script type="text/javascript"
+	src="http://status.openstack.org/jquery-graphite.js"></script>
+<script type="text/javascript"
+	src="http://status.openstack.org/common.js"></script>
+<script type="text/javascript"
+	src="status.js"></script>
    
    <!-- Google Fonts -->
    <link href='http://fonts.googleapis.com/css?family=PT+Sans&amp;subset=latin' rel='stylesheet' type='text/css'/>
@ -93,26 +98,7 @@ a:link {
  </HEAD>

  <BODY>
-    <div class="container">
-      <div id="header">
-	<div class="span-5">
-	  <h1 id="logo"><a href="/">Open Stack</a></h1>
-	</div>
-	<div class="span-19 last blueLine">
-	  
-	  <div id="navigation" class="span-19">
-	    <ul id="Menu1">
-	      <li><a href="/">Status</a></li>
-  	      <li><a href="/zuul/" class="current">Zuul</a></li>
-  	      <li><a href="/rechecks/">Rechecks</a></li>
-  	      <li><a href="/release/">Release</a></li>
-	      <li><a href="/reviews/">Reviews</a></li>
-	      <li><a href="/bugday/">Bugday</a></li>
- 	    </ul>
-	  </div>
-	</div>
-      </div>
-    </div>
+    <script type="text/javascript">header('Zuul');</script>

    <div class="container">
      <h1> Zuul Status </h1>
@ -183,46 +169,6 @@ $("#graph-container").append($(new Image()).addClass('graph').graphite({
      </script>
    </div>

-    <div class="container">
-      <hr />
-      <div id="footer">
-	<div class="span-4">
-	  <h3>OpenStack</h3>
-	  <ul>
-	    <li><a href="http://www.openstack.org/projects/">Projects</a></li>
-	    <li><a href="http://www.openstack.org/openstack-security/">OpenStack Security</a></li>
-	    <li><a href="http://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
-	    <li><a href="http://www.openstack.org/blog/">Blog</a></li>
-	  </ul>
-	</div>
-	<div class="span-4">
-	  <h3>Community</h3>
-	  <ul>
-	    <li><a href="http://www.openstack.org/community/">User Groups</a></li>
-	    <li><a href="http://www.openstack.org/events/">Events</a></li>
-	    <li><a href="http://www.openstack.org/jobs/">Jobs</a></li>
-	    <li><a href="http://www.openstack.org/companies/">Companies</a></li>
-	    <li><a href="http://wiki.openstack.org/HowToContribute">Contribute</a></li>
-	  </ul>
-	</div>
-	<div class="span-4">
-	  <h3>Documentation</h3>
-	  <ul>
-	    <li><a href="http://docs.openstack.org/">OpenStack Manuals</a></li>
-	    <li><a href="http://docs.openstack.org/diablo/openstack-compute/starter/content/">Getting Started</a></li>
-	    <li><a href="http://wiki.openstack.org/">Wiki</a></li>
-	  </ul>
-	</div>
-	<div class="span-4 last">
-	  <h3>Branding &amp; Legal</h3>
-	  <ul>
-	    <li><a href="http://www.openstack.org/brand/">Logos &amp; Guidelines</a></li>
-	    <li><a href="http://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
-	    <li><a href="http://www.openstack.org/privacy/">Privacy Policy</a></li>
-	    <li><a href="http://wiki.openstack.org/CLA">OpenStack CLA</a></li>
-	  </ul>
-	</div>
-      </div>
-    </div>
+    <script type="text/javascript">footer();</script>
  </BODY>
 </html>
--- a/modules/openstack_project/manifests/static.pp
+++ b/modules/openstack_project/manifests/static.pp
@ -169,6 +169,10 @@ class openstack_project::static (
    ensure => directory,
  }

+  package { 'libjs-jquery':
+    ensure => present,
+  }
+
  file { '/srv/static/status/index.html':
    ensure  => present,
    source  => 'puppet:///modules/openstack_project/status/index.html',
@ -181,6 +185,63 @@ class openstack_project::static (
    require => File['/srv/static/status'],
  }

+  file { '/srv/static/status/jquery.min.js':
+    ensure  => link,
+    target  => '/usr/share/javascript/jquery/jquery.min.js',
+    require => [File['/srv/static/status'],
+                Package['libjs-jquery']],
+  }
+
+  vcsrepo { '/opt/jquery-visibility':
+    ensure   => latest,
+    provider => git,
+    revision => 'master',
+    source   => 'https://github.com/mathiasbynens/jquery-visibility.git',
+  }
+
+  file { '/srv/static/status/jquery-visibility.min.js':
+    ensure  => link,
+    target  => '/opt/jquery-visibility/jquery-visibility.min.js',
+    require => [File['/srv/static/status'],
+                Vcsrepo['/opt/jquery-visibility']],
+  }
+
+  vcsrepo { '/opt/jquery-graphite':
+    ensure   => latest,
+    provider => git,
+    revision => 'master',
+    source   => 'https://github.com/prestontimmons/graphitejs.git',
+  }
+
+  file { '/srv/static/status/jquery-graphite.js':
+    ensure  => link,
+    target  => '/opt/jquery-graphite/jquery.graphite.js',
+    require => [File['/srv/static/status'],
+                Vcsrepo['/opt/jquery-graphite']],
+  }
+
+  ###########################################################
+  # Status - zuul
+
+  file { '/srv/static/status/zuul':
+    ensure => directory,
+  }
+
+  file { '/srv/static/status/zuul/index.html':
+    ensure  => present,
+    source  => 'puppet:///modules/openstack_project/zuul/status.html',
+    require => File['/srv/static/status/zuul'],
+  }
+
+  file { '/srv/static/status/zuul/status.js':
+    ensure  => present,
+    source  => 'puppet:///modules/openstack_project/zuul/status.js',
+    require => File['/srv/static/status/zuul'],
+  }
+
+  ###########################################################
+  # Status - reviewday
+
  include reviewday

  reviewday::site { 'reviewday':
--- a/modules/openstack_project/manifests/zuul.pp
+++ b/modules/openstack_project/manifests/zuul.pp
@ -65,56 +65,38 @@ class openstack_project::zuul(
  }

  file { '/var/lib/zuul/www':
-    ensure  => directory,
-    require => File['/var/lib/zuul'],
+    ensure  => absent,
  }

  file { '/var/lib/zuul/www/index.html':
-    ensure  => present,
-    source  => 'puppet:///modules/openstack_project/zuul/status.html',
-    require => File['/var/lib/zuul/www'],
+    ensure  => absent,
  }

  package { 'libjs-jquery':
-    ensure => present,
+    ensure => absent,
  }

  file { '/var/lib/zuul/www/jquery.min.js':
-    ensure  => link,
-    target  => '/usr/share/javascript/jquery/jquery.min.js',
-    require => [File['/var/lib/zuul/www'],
-                Package['libjs-jquery']],
+    ensure  => absent,
  }

  file { '/var/lib/zuul/www/status.js':
-    ensure  => present,
-    source  => 'puppet:///modules/openstack_project/zuul/status.js',
-    require => File['/var/lib/zuul/www'],
+    ensure  => absent,
  }

-  vcsrepo { '/opt/jquery-visibility':
-    ensure   => latest,
-    provider => git,
-    revision => 'master',
-    source   => 'https://github.com/mathiasbynens/jquery-visibility.git',
+  file { '/opt/jquery-visibility':
+    ensure   => absent,
  }

  file { '/var/lib/zuul/www/jquery-visibility.min.js':
-    ensure  => link,
-    target  => '/opt/jquery-visibility/jquery-visibility.min.js',
-    require => File['/var/lib/zuul/www'],
+    ensure   => absent,
  }

-  vcsrepo { '/opt/jquery-graphite':
-    ensure   => latest,
-    provider => git,
-    revision => 'master',
-    source   => 'https://github.com/prestontimmons/graphitejs.git',
+  file { '/opt/jquery-graphite':
+    ensure   => absent,
  }

  file { '/var/lib/zuul/www/jquery-graphite.js':
-    ensure  => link,
-    target  => '/opt/jquery-graphite/jquery.graphite.js',
-    require => File['/var/lib/zuul/www'],
+    ensure   => absent,
  }
 }
--- a/modules/openstack_project/templates/status.vhost.erb
+++ b/modules/openstack_project/templates/status.vhost.erb
@ -21,13 +21,6 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
    Allow from all
  </Location>

-  RewriteRule ^/zuul$ /zuul/ [R]
-  RewriteRule ^/zuul/(.*)$ http://zuul.openstack.org/$1 [P]
-  <Location /zuul/>
-    Order allow,deny
-    Allow from all
-  </Location>
-
  RewriteRule ^/release$ /release/ [R]
  RewriteRule ^/release/(.*)$ http://old-wiki.openstack.org/release/$1 [P]
  <Location /release/>
--- a/modules/zuul/templates/zuul.vhost.erb
+++ b/modules/zuul/templates/zuul.vhost.erb
@ -1,6 +1,6 @@
 <VirtualHost <%= scope.lookupvar("::zuul::vhost_name") %>:80>
  ServerAdmin <%= scope.lookupvar("::zuul::serveradmin") %>
-  DocumentRoot /var/lib/zuul/www
+  DocumentRoot /var/www

  ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::zuul::vhost_name") %>-error.log

@ -9,7 +9,8 @@
  CustomLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::zuul::vhost_name") %>-access.log combined

  RewriteEngine on
-  RewriteRule ^/zuul/status$ http://127.0.0.1:8001/status [P]
+  RewriteRule ^/$ http://status.openstack.org/zuul/ [R]
+  RewriteRule ^/zuul/status$ http://status.openstack.org/zuul/ [R]
  RewriteRule ^/status.json$ http://127.0.0.1:8001/status.json [P]

  Alias /rechecks.html /var/www/recheckwatch/rechecks.html