opendev/system-config
Code Issues Proposed changes

Add site_variables_yaml_file to ze01.o.o

Browse Source 
This now properly adds site_variables_yaml_file to the ::zuul class.

Change-Id: I4b78ee9140a715da137215f678bc0d8ad8229836
Depends-On: I734f2c338ceab2b1da2a3245423cb912b7dd8c00
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-08-03 21:05:14 -04:00
parent 8e9f609312
commit 20f9c99837
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
manifests/site.pp
View File

@ -1081,26 +1081,32 @@ node /^ze\d+\.openstack\.org$/ {
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
} }
class { '::project_config':
url => 'https://git.openstack.org/openstack-infra/project-config',
}
# NOTE(pabelanger): We call ::zuul directly, so we can override all in one # NOTE(pabelanger): We call ::zuul directly, so we can override all in one
# settings. # settings.
class { '::zuul': class { '::zuul':
gearman_server => 'zuulv3.openstack.org', gearman_server => 'zuulv3.openstack.org',
gerrit_server => $gerrit_server, gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user, gerrit_user => $gerrit_user,
zuul_ssh_private_key => $gerrit_ssh_private_key, zuul_ssh_private_key => $gerrit_ssh_private_key,
git_email => $git_email, git_email => $git_email,
git_name => $git_name, git_name => $git_name,
worker_private_key_file => '/var/lib/zuul/ssh/nodepool_id_rsa', worker_private_key_file => '/var/lib/zuul/ssh/nodepool_id_rsa',
revision => $revision, revision => $revision,
python_version => 3, python_version => 3,
zookeeper_hosts => 'nodepool.openstack.org:2181', zookeeper_hosts => 'nodepool.openstack.org:2181',
zuulv3 => true, zuulv3 => true,
connections => hiera('zuul_connections', []), connections => hiera('zuul_connections', []),
gearman_client_ssl_cert => hiera('gearman_client_ssl_cert'), gearman_client_ssl_cert => hiera('gearman_client_ssl_cert'),
gearman_client_ssl_key => hiera('gearman_client_ssl_key'), gearman_client_ssl_key => hiera('gearman_client_ssl_key'),
gearman_ssl_ca => hiera('gearman_ssl_ca'), gearman_ssl_ca => hiera('gearman_ssl_ca'),
trusted_ro_paths => ['/var/lib/zuul/ssh'], trusted_ro_paths => ['/var/lib/zuul/ssh'],
disk_limit_per_job => 500, # Megabytes disk_limit_per_job => 500, # Megabytes
site_variables_yaml_file => $::project_config::zuul_site_variables_yaml,
require => $::project_config::config_dir,
} }
class { '::zuul::executor': } class { '::zuul::executor': }