From 81e77fc27a4a4b0b1d2305f8eae8fc2c9d0bb244 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 27 Jul 2012 17:10:46 -0700
Subject: [PATCH] Fix the zuul reloading on config changes.

Zuul config files were broken out into a new module which introduced
cross module subscription dependencies. To make this work the module
doing the notify/subscribe must include the module the resource that
the subscription/notify is on. To fix this have config files notify
the zuul_reload exec.

Change-Id: I2d9e2236bc378d9dd92f811830dee6540b4cf4e2
---
 modules/openstack_project/manifests/zuul_config.pp | 10 +++++++---
 modules/zuul/manifests/init.pp                     |  1 -
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/openstack_project/manifests/zuul_config.pp b/modules/openstack_project/manifests/zuul_config.pp
index 3939c2697c..be93bf18cf 100644
--- a/modules/openstack_project/manifests/zuul_config.pp
+++ b/modules/openstack_project/manifests/zuul_config.pp
@@ -1,15 +1,19 @@
 class openstack_project::zuul_config {
+  include ::zuul
 
   file { "/etc/zuul/layout.yaml":
     ensure => 'present',
-    source => 'puppet:///modules/openstack_project/zuul/layout.yaml'
+    source => 'puppet:///modules/openstack_project/zuul/layout.yaml',
+    notify => Exec['zuul-reload'],
   }
   file { "/etc/zuul/openstack_functions.py":
     ensure => 'present',
-    source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py'
+    source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py',
+    notify => Exec['zuul-reload'],
   }
   file { "/etc/zuul/logging.conf":
     ensure => 'present',
-    source => 'puppet:///modules/openstack_project/zuul/logging.conf'
+    source => 'puppet:///modules/openstack_project/zuul/logging.conf',
+    notify => Exec['zuul-reload'],
   }
 }
diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index d071d9b81c..4c4c3e42fa 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -64,7 +64,6 @@ class zuul ()
       command => '/etc/init.d/zuul reload',
       require => File['/etc/init.d/zuul'],
       refreshonly => true,
-      subscribe => [ File["/etc/zuul/layout.yaml"], File["/etc/zuul/logging.conf"], ],
   }
 
   service { 'zuul':