From 15493f562ebd01ba054d8e59419c4a5fb3a57a0e Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 23 Jul 2012 19:32:21 -0500
Subject: [PATCH] Fix errors found on dashboard for jenkins.

Change-Id: Iec0e8e45291786746866b066e4cc6dfcdfd4de8b
---
 modules/openstack_project/manifests/jenkins.pp     |  7 ++++++-
 modules/openstack_project/manifests/zuul_config.pp | 10 +++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/openstack_project/manifests/jenkins.pp b/modules/openstack_project/manifests/jenkins.pp
index 3b7ebd5112..d768f4d0e0 100644
--- a/modules/openstack_project/manifests/jenkins.pp
+++ b/modules/openstack_project/manifests/jenkins.pp
@@ -1,4 +1,6 @@
 class openstack_project::jenkins {
+  include openstack_project::zuul_config
+
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80, 443, 4155]
   }
@@ -16,5 +18,8 @@ class openstack_project::jenkins {
     password => hiera('jenkins_jobs_password'),
     site => "openstack",
   }
-  class { "openstack_project::zuul_config": }
+  file { "/etc/default/jenkins":
+    ensure => 'present',
+    source => 'puppet:///modules/openstack_project/jenkins/jenkins.default'
+  }
 }
diff --git a/modules/openstack_project/manifests/zuul_config.pp b/modules/openstack_project/manifests/zuul_config.pp
index 5f515b5814..3939c2697c 100644
--- a/modules/openstack_project/manifests/zuul_config.pp
+++ b/modules/openstack_project/manifests/zuul_config.pp
@@ -2,18 +2,14 @@ class openstack_project::zuul_config {
 
   file { "/etc/zuul/layout.yaml":
     ensure => 'present',
-    source => 'puppet:///modules/openstack_ci/zuul/layout.yaml'
+    source => 'puppet:///modules/openstack_project/zuul/layout.yaml'
   }
   file { "/etc/zuul/openstack_functions.py":
     ensure => 'present',
-    source => 'puppet:///modules/openstack_ci/zuul/openstack_functions.py'
+    source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py'
   }
   file { "/etc/zuul/logging.conf":
     ensure => 'present',
-    source => 'puppet:///modules/openstack_ci/zuul/logging.conf'
-  }
-  file { "/etc/default/jenkins":
-    ensure => 'present',
-    source => 'puppet:///modules/openstack_ci/jenkins/jenkins.default'
+    source => 'puppet:///modules/openstack_project/zuul/logging.conf'
   }
 }