From a2c8473fe445ad6e043ad5a76b6464675e98d029 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Fri, 24 Aug 2012 10:44:27 -0700
Subject: [PATCH] Add url_pattern to zuul.conf.

Change-Id: Ib1d05a42e98613e746cbd7865cd97ce25f6a26c0
Reviewed-on: https://review.openstack.org/11940
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: James E. Blair <corvus@inaugust.com>
---
 manifests/site.pp                           | 1 +
 modules/openstack_project/manifests/zuul.pp | 4 +++-
 modules/zuul/manifests/init.pp              | 3 ++-
 modules/zuul/templates/zuul.conf.erb        | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 2bc8e17bad..3c55443e99 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -38,6 +38,7 @@ node "jenkins.openstack.org" {
     jenkins_apikey => hiera('zuul_jenkins_apikey'),
     gerrit_server => 'review.openstack.org',
     gerrit_user => 'jenkins',
+    url_pattern => 'http://logs.openstack.org/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}'
   }
 }
 
diff --git a/modules/openstack_project/manifests/zuul.pp b/modules/openstack_project/manifests/zuul.pp
index 666bbd4c81..c8ac1e77e8 100644
--- a/modules/openstack_project/manifests/zuul.pp
+++ b/modules/openstack_project/manifests/zuul.pp
@@ -3,7 +3,8 @@ class openstack_project::zuul(
   $jenkins_user,
   $jenkins_apikey,
   $gerrit_server,
-  $gerrit_user
+  $gerrit_user,
+  $url_pattern
   ) {
 
   class { "::zuul":
@@ -12,6 +13,7 @@ class openstack_project::zuul(
     jenkins_apikey => $jenkins_apikey,
     gerrit_server => $gerrit_server,
     gerrit_user => $gerrit_user,
+    url_pattern => $url_pattern
   }
 
   file { "/etc/zuul/layout.yaml":
diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 82af3304b4..b4272d7463 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -3,7 +3,8 @@ class zuul (
     $jenkins_user,
     $jenkins_apikey,
     $gerrit_server,
-    $gerrit_user
+    $gerrit_user,
+    $url_pattern
 ) {
   $packages = ["python-webob",
                "python-daemon",
diff --git a/modules/zuul/templates/zuul.conf.erb b/modules/zuul/templates/zuul.conf.erb
index 51f8c4b944..490a409c76 100644
--- a/modules/zuul/templates/zuul.conf.erb
+++ b/modules/zuul/templates/zuul.conf.erb
@@ -14,3 +14,4 @@ log_config=/etc/zuul/logging.conf
 state_dir=/var/lib/zuul
 git_dir=/var/lib/zuul/git
 push_change_refs=true
+url_pattern=<%= url_pattern %>