From e323bf97f7672bbe324743c9b255ccf02f56fc3c Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 3 Aug 2017 14:16:45 -0400 Subject: [PATCH] Add site-variable yaml file to ze01.o.o This will store site specific variables, used by our zuulv3 jobs. Change-Id: I37b95d93f689cc71a9fbf83ca77c85bfb2a722ae Depends-On: I1e1d6ef7476586131334e0e34772499b808c6da9 Depends-On: I2a5d65b6f43a3866f1f10e47cb545f70397739f0 Signed-off-by: Paul Belanger --- manifests/site.pp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/manifests/site.pp b/manifests/site.pp index 429c9ab2b4..4eac05f672 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1103,7 +1103,14 @@ node /^ze\d+\.openstack\.org$/ { disk_limit_per_job => 500, # Megabytes } - class { '::zuul::executor': } + class { '::project_config': + url => 'https://git.openstack.org/openstack-infra/project-config', + } + + class { '::zuul::executor': + site_variable_yaml_file => $::project_config::zuul_executor_site_variables_yaml, + require => $::project_config::config_dir, + } file { '/var/lib/zuul/ssh/nodepool_id_rsa': owner => 'zuul',