opendev/system-config
Code Issues Proposed changes

Merge "Add configurable url for OpenStack status"

Browse Source
This commit is contained in:
Jenkins 2015-03-13 16:14:56 +00:00 committed by Gerrit Code Review
commit d8aeab6eee
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openstack_project/manifests/status.pp
View File

@ -12,6 +12,8 @@ class openstack_project::status (
$recheck_ssh_private_key, $recheck_ssh_private_key,
$recheck_bot_passwd, $recheck_bot_passwd,
$recheck_bot_nick, $recheck_bot_nick,
$status_base_url = 'http://status.openstack.org/',
$status_title = 'OpenStack',
) { ) {
class { 'openstack_project::server': class { 'openstack_project::server':
@ -77,8 +79,9 @@ class openstack_project::status (
file { '/srv/static/status/common.js': file { '/srv/static/status/common.js':
ensure => present, ensure => present,
source => 'puppet:///modules/openstack_project/status/common.js', content => template('openstack_project/status/common.js.erb'),
require => File['/srv/static/status'], require => File['/srv/static/status'],
replace => true,
} }
file { '/srv/static/status/jquery.min.js': file { '/srv/static/status/jquery.min.js':

14
modules/openstack_project/files/status/common.js → modules/openstack_project/templates/status/common.js.erb
View File

@ -15,17 +15,17 @@
function header(activeTabName) { function header(activeTabName) {
tabsName = new Array(); tabsName = new Array();
tabsLink = new Array(); tabsLink = new Array();
tabsName[0] = 'Status'; tabsLink[0] = 'http://status.openstack.org/'; tabsName[0] = 'Status'; tabsLink[0] = '<%= @status_base_url %>';
tabsName[1] = 'Zuul'; tabsLink[1] = 'http://status.openstack.org/zuul/'; tabsName[1] = 'Zuul'; tabsLink[1] = '<%= @status_base_url %>/zuul/';
tabsName[2] = 'Rechecks'; tabsLink[2] = 'http://status.openstack.org/elastic-recheck/'; tabsName[2] = 'Rechecks'; tabsLink[2] = '<%= @status_base_url %>/elastic-recheck/';
tabsName[3] = 'Release'; tabsLink[3] = 'http://status.openstack.org/release/'; tabsName[3] = 'Release'; tabsLink[3] = '<%= @status_base_url %>/release/';
tabsName[4] = 'Reviews'; tabsLink[4] = 'http://status.openstack.org/reviews/'; tabsName[4] = 'Reviews'; tabsLink[4] = '<%= @status_base_url %>/reviews/';
tabsName[5] = 'Bugday'; tabsLink[5] = 'http://status.openstack.org/bugday/'; tabsName[5] = 'Bugday'; tabsLink[5] = '<%= @status_base_url %>/bugday/';
document.write( document.write(
'<div id="header" class="container">'+ '<div id="header" class="container">'+
'<div class="span-5">'+ '<div class="span-5">'+
' <h1 id="logo"><a href="http://status.openstack.org/">Open Stack</a></h1>'+ ' <h1 id="logo"><a href="<%= @status_base_url %>"><%= @status_title %></a></h1>'+
'</div>\n'+ '</div>\n'+
'<div class="span-19 last blueLine">'+ '<div class="span-19 last blueLine">'+
'<div id="navigation" class="span-19">'+ '<div id="navigation" class="span-19">'+