Merge "CI: Jammy followup - move os_release" into stable/yoga

stackhpc · Mar 6, 2023 · 5b35bbc · 5b35bbc
2 parents a292e4b + 524bc87
commit 5b35bbc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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