From 4fdeb01562e7b0d1ba20aedd1d02c792a72472a9 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Tue, 19 Sep 2023 11:11:24 +0200 Subject: [PATCH 1/2] fix build of rocky images --- etc/kayobe/kolla.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index ec35dba2d..dbd238642 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -329,7 +329,7 @@ kolla_build_blocks: {% endfor %} footer: | {% if stackhpc_kolla_clean_up_repo_mirrors | bool %} - {% if kolla_base_distro == 'centos' %} + {% if kolla_base_distro in ['centos', 'rocky'] %} RUN \ tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d && \ if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/yum.repos.d; then \ From e6309a7fe054f9851fcf12662d0bfb5ccff2a67a Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Tue, 19 Sep 2023 11:39:38 +0200 Subject: [PATCH 2/2] fix ubuntu build --- etc/kayobe/kolla.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index dbd238642..c6b2cf889 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -322,7 +322,7 @@ kolla_build_blocks: {% endif %} base_ubuntu_package_sources_list: | RUN \ - mv /etc/apt/sources.list{,.backup} && \ + mv /etc/apt/sources.list /etc/apt/sources.list.backup && \ {% for repo in stackhpc_ubuntu_focal_repos %} echo '{{ repo }}' >> /etc/apt/sources.list {% if not loop.last %} && \ {% endif %}