From 0c7e209f90fedef332642d1633d8f916bd582480 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 20 Oct 2023 14:39:15 +0200 Subject: [PATCH] Apply centos build customisations on rocky also --- etc/kayobe/kolla.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 1bb627781..5074bdea5 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -389,7 +389,7 @@ kolla_build_customizations_common: ironic_inspector_pip_packages_append: - /additions/* -kolla_build_customizations_centos: +kolla_build_customizations_redhat: base_yum_repo_files_remove: - proxysql.repo neutron_base_packages_remove: @@ -439,7 +439,7 @@ kolla_build_customizations_ubuntu: {} # Hyphens in the image name must be replaced with underscores. The # customization is most commonly packages. The operation should be one of # override, append or remove. The value should be a list. -kolla_build_customizations: "{{ kolla_build_customizations_common | combine(kolla_build_customizations_centos if kolla_base_distro == 'centos' else kolla_build_customizations_ubuntu) }}" +kolla_build_customizations: "{{ kolla_build_customizations_common | combine(kolla_build_customizations_redhat if kolla_base_distro in ['centos', 'rocky'] else kolla_build_customizations_ubuntu) }}" # Dict mapping Kolla Dockerfile ARG names to their values. kolla_build_args: