opendev/system-config
Code Issues Proposed changes

Fix jquery setup on Gerrit server.

Browse Source 
The libjs-query package sets up jquery on trusty with these
files and sim links:

 ~$ ll /usr/share/javascript/jquery/
 drwxr-xr-x 2 root root   4096 Jan 15 20:44 ./
 drwxr-xr-x 5 root root   4096 Jan 15 20:44 ../
 -rw-r--r-- 1 root root 252879 Jul  5  2013 jquery.js
 lrwxrwxrwx 1 root root     13 Jul  5  2013 jquery.lite.js -> jquery.min.js
 lrwxrwxrwx 1 root root      9 Jul  5  2013 jquery.min.js -> jquery.js
 lrwxrwxrwx 1 root root     13 Jul  5  2013 jquery.pack.js -> jquery.min.js
 -rw-r--r-- 1 root root      5 May 23  2012 version.txt

The current puppet config is broken for trusty because it attempts to copy
the link instead of the file. This results in a broken sim link to jquery
and breaks the Toggle CI button on Gerrit because that button depends on
jquery.  This change corrects this situation by copying the file provided
jquery.js file instead of the link.

Change-Id: I18056ca528871d9a96218f0919bbd262da005f31
This commit is contained in:
Khai Do 2015-03-17 09:53:48 -07:00
parent b3ba5531f1
commit 56d046c2bf
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/files/gerrit/GerritSiteHeader.html
View File

@ -1,5 +1,5 @@
<div>
<script type="text/javascript" src="static/jquery.min.js" />
<script type="text/javascript" src="static/jquery.js" />
<script type="text/javascript" src="static/hideci.js" />
<a href="/"><h1 style="color: #CF2F19"><img src="static/title.png" style="vertical-align:middle;" /></h1></a>
</div>

14
modules/openstack_project/manifests/gerrit.pp
View File

@ -271,12 +271,16 @@ class openstack_project::gerrit (
ensure => present,
}
file { '/home/gerrit2/review_site/static/jquery.min.js':
file { '/home/gerrit2/review_site/static/jquery.js':
ensure => present,
source => '/usr/share/javascript/jquery/jquery.min.js',
require => [Class['::gerrit'],
Package['libjs-jquery']],
notify => Exec['reload_gerrit_header'],
source => '/usr/share/javascript/jquery/jquery.js',
require => [
File['/home/gerrit2/review_site/static'],
Class['::gerrit'],
Package['libjs-jquery'],
],
subscribe => Package['libjs-jquery'],
notify => Exec['reload_gerrit_header'],
}
file { '/home/gerrit2/review_site/static/hideci.js':