From 7dc506ef48e53be9127385516d6ce045de321950 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Tue, 7 Feb 2023 17:45:53 +0100
Subject: [PATCH] CI: Don't run Heat and Horizon in overcloud jobs
Not only TLS jobs need that treatment, Rocky9/CentOS
Stream 9 jobs have the same issue - let's disable
Heat and Horizon in all overcloud jobs.
Change-Id: Iecab44969cea015b363ec6884ef6a7c9960a6b3f
---
playbooks/kayobe-overcloud-base/overrides.yml.j2 | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/playbooks/kayobe-overcloud-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-base/overrides.yml.j2
index 599f39d1..c3376987 100644
--- a/playbooks/kayobe-overcloud-base/overrides.yml.j2
+++ b/playbooks/kayobe-overcloud-base/overrides.yml.j2
@@ -33,6 +33,11 @@ compute_libvirt_sasl_password: "{% raw %}{{ lookup('password', '/tmp/libvirt-sas
# Enable ironic for testing baremetal compute.
kolla_enable_ironic: true
+# extra RAM usage is causing the OOM killer to terminate
+# Tenks VMs. Disable Heat and Horizon to free up enough memory.
+kolla_enable_heat: false
+kolla_enable_horizon: false
+
{% if tls_enabled %}
kolla_enable_nova_libvirt_container: false
compute_libvirt_enable_tls: true
@@ -42,11 +47,6 @@ kolla_enable_tls_internal: "yes"
kolla_ironic_pxe_append_params_extra:
- ipa-insecure=1
-
-# When TLS is enabled, extra RAM usage is causing the OOM killer to terminate
-# Tenks VMs. Disable Heat and Horizon to free up enough memory.
-kolla_enable_heat: false
-kolla_enable_horizon: false
{% endif %}
# NOTE(bbezak): Kolla does not build CentOS Stream 9 container images.
--
GitLab