opendev/system-config
Code Issues Proposed changes

Move zuul layout into /etc/zuul/layout

Browse Source 
Move the layout.yaml and functions files into a subdir of /etc/zuul
to facilitate the separation of project and system configuration.

Change-Id: Ib62063ffef91c370d4626e8590ac856177f6099f
This commit is contained in:
James E. Blair 2014-09-18 20:47:33 +00:00
parent 1e7874e1eb
commit a7810c3f99
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/manifests/zuul_dev.pp
View File

@ -65,13 +65,13 @@ class openstack_project::zuul_dev(
} }
} }
file { '/etc/zuul/layout.yaml': file { '/etc/zuul/layout/layout.yaml':
ensure => present, ensure => present,
source => 'puppet:///modules/openstack_project/zuul/layout-dev.yaml', source => 'puppet:///modules/openstack_project/zuul/layout-dev.yaml',
notify => Exec['zuul-reload'], notify => Exec['zuul-reload'],
} }
file { '/etc/zuul/openstack_functions.py': file { '/etc/zuul/layout/openstack_functions.py':
ensure => present, ensure => present,
source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py', source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py',
notify => Exec['zuul-reload'], notify => Exec['zuul-reload'],

4
modules/openstack_project/manifests/zuul_prod.pp
View File

@ -75,13 +75,13 @@ class openstack_project::zuul_prod(
} }
} }
file { '/etc/zuul/layout.yaml': file { '/etc/zuul/layout/layout.yaml':
ensure => present, ensure => present,
source => 'puppet:///modules/openstack_project/zuul/layout.yaml', source => 'puppet:///modules/openstack_project/zuul/layout.yaml',
notify => Exec['zuul-reload'], notify => Exec['zuul-reload'],
} }
file { '/etc/zuul/openstack_functions.py': file { '/etc/zuul/layout/openstack_functions.py':
ensure => present, ensure => present,
source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py', source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py',
notify => Exec['zuul-reload'], notify => Exec['zuul-reload'],

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

@ -146,6 +146,11 @@ class zuul (
ensure => directory, ensure => directory,
} }
file { '/etc/zuul/layout':
ensure => directory,
require => File['/etc/zuul'],
}
# TODO: We should put in notify either Service['zuul'] or Exec['zuul-reload'] # TODO: We should put in notify either Service['zuul'] or Exec['zuul-reload']
# at some point, but that still has some problems. # at some point, but that still has some problems.
file { '/etc/zuul/zuul.conf': file { '/etc/zuul/zuul.conf':

2
modules/zuul/templates/zuul.conf.erb
View File

@ -14,7 +14,7 @@ baseurl=<%= gerrit_baseurl %>
<% end -%> <% end -%>
[zuul] [zuul]
layout_config=/etc/zuul/layout.yaml layout_config=/etc/zuul/layout/layout.yaml
log_config=/etc/zuul/logging.conf log_config=/etc/zuul/logging.conf
state_dir=/var/lib/zuul state_dir=/var/lib/zuul
git_dir=/var/lib/zuul/git git_dir=/var/lib/zuul/git