opendev/system-config
Code Issues Proposed changes

Fix the zuul reloading on config changes.

Browse Source 
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
This commit is contained in:
Clark Boylan 2012-07-27 17:10:46 -07:00
parent ff1a2f5691
commit 81e77fc27a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openstack_project/manifests/zuul_config.pp
View File

@ -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'],
}
}

1
modules/zuul/manifests/init.pp
View File

@ -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':