From d901835247ebf344fe2475600fe0a02d2eca3304 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 17 May 2022 18:14:06 +0100 Subject: [PATCH] Template out zuul mirror info variables for later use by embedded ansible zuul_site_mirror_info is still work-in-progress and may be undefined. Change-Id: I1faee76e356a5abf2e7c9fbd85fdbbce49b54650 --- zuul.d/playbooks/pre-gate-scenario.yml | 2 ++ zuul.d/playbooks/templates/osa-job-vars.yml.j2 | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/zuul.d/playbooks/pre-gate-scenario.yml b/zuul.d/playbooks/pre-gate-scenario.yml index 57ee2938a5..7a11b445b4 100644 --- a/zuul.d/playbooks/pre-gate-scenario.yml +++ b/zuul.d/playbooks/pre-gate-scenario.yml @@ -118,6 +118,8 @@ vars: zuul_helper_var: zuul: "{{ zuul }}" + zuul_site_mirror_info_helper_var: + zuul_site_mirror_info: "{{ zuul_site_mirror_info | default({}) }}" template: src: osa-job-vars.yml.j2 dest: "{{ zuul_user_vars_file }}" diff --git a/zuul.d/playbooks/templates/osa-job-vars.yml.j2 b/zuul.d/playbooks/templates/osa-job-vars.yml.j2 index 077fdd9f30..8c18a1d45b 100644 --- a/zuul.d/playbooks/templates/osa-job-vars.yml.j2 +++ b/zuul.d/playbooks/templates/osa-job-vars.yml.j2 @@ -1,2 +1,8 @@ --- {{ zuul_helper_var | to_nice_yaml(indent=2) }} + +zuul_site_mirror_fqdn: {{ zuul_site_mirror_fqdn | default('') }} + +zuul_site_local_mirror_host: {{ zuul_site_local_mirror_host | default('') }} + +{{ zuul_site_mirror_info_helper_var | to_nice_yaml(indent=2) }}