Move zuul layout into /etc/zuul/layout
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:
parent
1e7874e1eb
commit
a7810c3f99
modules
@ -65,13 +65,13 @@ class openstack_project::zuul_dev(
|
||||
}
|
||||
}
|
||||
|
||||
file { '/etc/zuul/layout.yaml':
|
||||
file { '/etc/zuul/layout/layout.yaml':
|
||||
ensure => present,
|
||||
source => 'puppet:///modules/openstack_project/zuul/layout-dev.yaml',
|
||||
notify => Exec['zuul-reload'],
|
||||
}
|
||||
|
||||
file { '/etc/zuul/openstack_functions.py':
|
||||
file { '/etc/zuul/layout/openstack_functions.py':
|
||||
ensure => present,
|
||||
source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py',
|
||||
notify => Exec['zuul-reload'],
|
||||
|
@ -75,13 +75,13 @@ class openstack_project::zuul_prod(
|
||||
}
|
||||
}
|
||||
|
||||
file { '/etc/zuul/layout.yaml':
|
||||
file { '/etc/zuul/layout/layout.yaml':
|
||||
ensure => present,
|
||||
source => 'puppet:///modules/openstack_project/zuul/layout.yaml',
|
||||
notify => Exec['zuul-reload'],
|
||||
}
|
||||
|
||||
file { '/etc/zuul/openstack_functions.py':
|
||||
file { '/etc/zuul/layout/openstack_functions.py':
|
||||
ensure => present,
|
||||
source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py',
|
||||
notify => Exec['zuul-reload'],
|
||||
|
@ -146,6 +146,11 @@ class zuul (
|
||||
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']
|
||||
# at some point, but that still has some problems.
|
||||
file { '/etc/zuul/zuul.conf':
|
||||
|
@ -14,7 +14,7 @@ baseurl=<%= gerrit_baseurl %>
|
||||
<% end -%>
|
||||
|
||||
[zuul]
|
||||
layout_config=/etc/zuul/layout.yaml
|
||||
layout_config=/etc/zuul/layout/layout.yaml
|
||||
log_config=/etc/zuul/logging.conf
|
||||
state_dir=/var/lib/zuul
|
||||
git_dir=/var/lib/zuul/git
|
||||
|
Loading…
Reference in New Issue
Block a user