From 20f9c99837c5033d1e5a81e2d96ad2077bfec307 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 3 Aug 2017 21:05:14 -0400 Subject: [PATCH] Add site_variables_yaml_file to ze01.o.o This now properly adds site_variables_yaml_file to the ::zuul class. Change-Id: I4b78ee9140a715da137215f678bc0d8ad8229836 Depends-On: I734f2c338ceab2b1da2a3245423cb912b7dd8c00 Signed-off-by: Paul Belanger --- manifests/site.pp | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 429c9ab2b4..7743292446 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1081,26 +1081,32 @@ node /^ze\d+\.openstack\.org$/ { 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 # settings. class { '::zuul': - gearman_server => 'zuulv3.openstack.org', - gerrit_server => $gerrit_server, - gerrit_user => $gerrit_user, - zuul_ssh_private_key => $gerrit_ssh_private_key, - git_email => $git_email, - git_name => $git_name, - worker_private_key_file => '/var/lib/zuul/ssh/nodepool_id_rsa', - revision => $revision, - python_version => 3, - zookeeper_hosts => 'nodepool.openstack.org:2181', - zuulv3 => true, - connections => hiera('zuul_connections', []), - gearman_client_ssl_cert => hiera('gearman_client_ssl_cert'), - gearman_client_ssl_key => hiera('gearman_client_ssl_key'), - gearman_ssl_ca => hiera('gearman_ssl_ca'), - trusted_ro_paths => ['/var/lib/zuul/ssh'], - disk_limit_per_job => 500, # Megabytes + gearman_server => 'zuulv3.openstack.org', + gerrit_server => $gerrit_server, + gerrit_user => $gerrit_user, + zuul_ssh_private_key => $gerrit_ssh_private_key, + git_email => $git_email, + git_name => $git_name, + worker_private_key_file => '/var/lib/zuul/ssh/nodepool_id_rsa', + revision => $revision, + python_version => 3, + zookeeper_hosts => 'nodepool.openstack.org:2181', + zuulv3 => true, + connections => hiera('zuul_connections', []), + gearman_client_ssl_cert => hiera('gearman_client_ssl_cert'), + gearman_client_ssl_key => hiera('gearman_client_ssl_key'), + gearman_ssl_ca => hiera('gearman_ssl_ca'), + trusted_ro_paths => ['/var/lib/zuul/ssh'], + disk_limit_per_job => 500, # Megabytes + site_variables_yaml_file => $::project_config::zuul_site_variables_yaml, + require => $::project_config::config_dir, } class { '::zuul::executor': }