From 80bf9229a2788adfaf5dff424424a9fa7cce7790 Mon Sep 17 00:00:00 2001
From: Yolanda Robla <yolanda.robla-mota@hp.com>
Date: Fri, 6 Mar 2015 15:49:21 +0100
Subject: [PATCH] Add configurable graphite url on zuul status

Add the ability to pass the graphite url by parameter
on zuul status page.

Change-Id: I3252ea2b727e3867136bba3256239bcae409e99e
---
 modules/openstack_project/manifests/status.pp                | 5 +++--
 .../zuul/status.html => templates/zuul/status.html.erb}      | 2 +-
 .../{files/zuul/status.js => templates/zuul/status.js.erb}   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename modules/openstack_project/{files/zuul/status.html => templates/zuul/status.html.erb} (99%)
 rename modules/openstack_project/{files/zuul/status.js => templates/zuul/status.js.erb} (99%)

diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp
index 41b8d5ff21..ce51c631d9 100644
--- a/modules/openstack_project/manifests/status.pp
+++ b/modules/openstack_project/manifests/status.pp
@@ -14,6 +14,7 @@ class openstack_project::status (
   $recheck_bot_nick,
   $status_base_url = 'http://status.openstack.org/',
   $status_title = 'OpenStack',
+  $graphite_render_url = 'http://graphite.openstack.org/render/',
 ) {
 
   class { 'openstack_project::server':
@@ -161,13 +162,13 @@ class openstack_project::status (
 
   file { '/srv/static/status/zuul/index.html':
     ensure  => present,
-    source  => 'puppet:///modules/openstack_project/zuul/status.html',
+    content => template('openstack_project/zuul/status.html.erb'),
     require => File['/srv/static/status/zuul'],
   }
 
   file { '/srv/static/status/zuul/status.js':
     ensure  => present,
-    source  => 'puppet:///modules/openstack_project/zuul/status.js',
+    content => template('openstack_project/zuul/status.js.erb'),
     require => File['/srv/static/status/zuul'],
   }
 
diff --git a/modules/openstack_project/files/zuul/status.html b/modules/openstack_project/templates/zuul/status.html.erb
similarity index 99%
rename from modules/openstack_project/files/zuul/status.html
rename to modules/openstack_project/templates/zuul/status.html.erb
index 160e9df623..358d0813d1 100644
--- a/modules/openstack_project/files/zuul/status.html
+++ b/modules/openstack_project/templates/zuul/status.html.erb
@@ -300,7 +300,7 @@ progress[aria-valuenow]:before  {
       <h2> Job Stats </h2>
 
       <script type="text/javascript">
-$.fn.graphite.defaults.url = "http://graphite.openstack.org/render/";
+$.fn.graphite.defaults.url = "<%= @graphite_render_url %>";
 
 $("#graph-container").append($(new Image()).addClass('graph').graphite({
     from: "-24hours",
diff --git a/modules/openstack_project/files/zuul/status.js b/modules/openstack_project/templates/zuul/status.js.erb
similarity index 99%
rename from modules/openstack_project/files/zuul/status.js
rename to modules/openstack_project/templates/zuul/status.js.erb
index c48836f868..b811f963ac 100644
--- a/modules/openstack_project/files/zuul/status.js
+++ b/modules/openstack_project/templates/zuul/status.js.erb
@@ -147,7 +147,7 @@ function create_tree(pipeline) {
 function get_sparkline_url(pipeline_name) {
     if (!(pipeline_name in window.zuul_sparkline_urls)) {
         window.zuul_sparkline_urls[pipeline_name] = $.fn.graphite.geturl({
-            url: "http://graphite.openstack.org/render/",
+            url: "<%= @graphite_render_url %>",
             from: "-8hours",
             width: 100,
             height: 16,