From 524bc87bf0ff86c01b1a6913ad54b3d029fb8e74 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 1 Mar 2023 14:21:27 +0100 Subject: [PATCH] CI: Jammy followup - move os_release Change-Id: Idc6fae38d86631930bdc13b694d1516463ad7678 --- playbooks/kayobe-overcloud-base/globals.yml.j2 | 4 ---- playbooks/kayobe-overcloud-base/overrides.yml.j2 | 4 ++++ playbooks/kayobe-seed-base/overrides.yml.j2 | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/playbooks/kayobe-overcloud-base/globals.yml.j2 b/playbooks/kayobe-overcloud-base/globals.yml.j2 index dfa636c9d..58c4c7ec9 100644 --- a/playbooks/kayobe-overcloud-base/globals.yml.j2 +++ b/playbooks/kayobe-overcloud-base/globals.yml.j2 @@ -1,8 +1,4 @@ --- -{% if ansible_facts.distribution_release == "jammy" %} -os_release: "jammy" -{% endif %} - # Use HTTPS opendev quay.io registry proxy. docker_registry_insecure: no diff --git a/playbooks/kayobe-overcloud-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-base/overrides.yml.j2 index 116ea168d..e60ff398b 100644 --- a/playbooks/kayobe-overcloud-base/overrides.yml.j2 +++ b/playbooks/kayobe-overcloud-base/overrides.yml.j2 @@ -1,4 +1,8 @@ --- +{% if ansible_facts.distribution_release == "jammy" %} +os_release: "jammy" +{% endif %} + # NOTE(mgoddard): Don't reboot after disabling SELinux during CI testing, as # Ansible is run directly on the controller. disable_selinux_do_reboot: false diff --git a/playbooks/kayobe-seed-base/overrides.yml.j2 b/playbooks/kayobe-seed-base/overrides.yml.j2 index 806430301..0fe7afdef 100644 --- a/playbooks/kayobe-seed-base/overrides.yml.j2 +++ b/playbooks/kayobe-seed-base/overrides.yml.j2 @@ -1,4 +1,8 @@ --- +{% if ansible_facts.distribution_release == "jammy" %} +os_release: "jammy" +{% endif %} + # NOTE(mgoddard): Don't reboot after disabling SELinux during CI testing, as # Ansible is run directly on the controller. disable_selinux_do_reboot: false