From 7338da8e4b3e60996ea57e6ce6f05cdbb9bb5b2d Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Wed, 30 May 2012 09:25:41 -0700
Subject: [PATCH] Add missing zuul parameters

Change-Id: I41e8eb35b34a7566e94ece4d144675faf6c93ba3
---
 .../files/projects/openstack/zuul.yml         | 39 ++++++++++++++++---
 modules/zuul/manifests/init.pp                | 12 ++++++
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/modules/jenkins_jobs/files/projects/openstack/zuul.yml b/modules/jenkins_jobs/files/projects/openstack/zuul.yml
index 9b47974297..e6c8943739 100644
--- a/modules/jenkins_jobs/files/projects/openstack/zuul.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/zuul.yml
@@ -19,9 +19,18 @@ parameters:
   - name: UUID
     type: string
     description: Zuul provided key to link builds with Gerrit events
-  - name: changes
+  - name: DEPENDENT_CHANGES
     type: string
-    description: Zuul provided list of changes to merge
+    description: Zuul provided list of dependent changes to merge
+  - name: GERRIT_PROJECT
+    type: string
+    description: Zuul provided project name
+  - name: GERRIT_BRANCH
+    type: string
+    description: Zuul provided branch name
+  - name: GERRIT_REFSPEC
+    type: string
+    description: Zuul provided refspec of the change to test
 
 notification_endpoints:
   - protocol: HTTP
@@ -58,9 +67,18 @@ parameters:
   - name: UUID
     type: string
     description: Zuul provided key to link builds with Gerrit events
-  - name: changes
+  - name: DEPENDENT_CHANGES
     type: string
-    description: Zuul provided list of changes to merge
+    description: Zuul provided list of dependent changes to merge
+  - name: GERRIT_PROJECT
+    type: string
+    description: Zuul provided project name
+  - name: GERRIT_BRANCH
+    type: string
+    description: Zuul provided branch name
+  - name: GERRIT_REFSPEC
+    type: string
+    description: Zuul provided refspec of the change to test
 
 notification_endpoints:
   - protocol: HTTP
@@ -97,9 +115,18 @@ parameters:
   - name: UUID
     type: string
     description: Zuul provided key to link builds with Gerrit events
-  - name: changes
+  - name: DEPENDENT_CHANGES
     type: string
-    description: Zuul provided list of changes to merge
+    description: Zuul provided list of dependent changes to merge
+  - name: GERRIT_PROJECT
+    type: string
+    description: Zuul provided project name
+  - name: GERRIT_BRANCH
+    type: string
+    description: Zuul provided branch name
+  - name: GERRIT_REFSPEC
+    type: string
+    description: Zuul provided refspec of the change to test
 
 notification_endpoints:
   - protocol: HTTP
diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index c058e42e5a..36e34fdd5d 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -1,5 +1,12 @@
 class zuul ()
 {
+  $packages = ["python-webob",
+               "python-paste"]
+
+  package { $packages:
+    ensure => "present",
+  }
+
   # if we already have the repo the pull updates
 
   exec { "update_zuul":
@@ -28,4 +35,9 @@ class zuul ()
   file { "/etc/zuul":
     ensure => "directory",
   }
+
+  file { "/var/log/zuul":
+    ensure => "directory",
+    owner => 'jenkins'
+  }
 }