Skip to content

Commit 8bca2f5

Browse files
committed
check this exists before modifying it
1 parent 99b96db commit 8bca2f5

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

etc/kayobe/kolla.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,9 @@ stackhpc_rocky_10_additional_repos:
256256
- url: "{{ stackhpc_repo_centos_stream_10_nfv_openvswitch_url }}"
257257
file: "CentOS-NFV-OpenvSwitch.repo"
258258
tag: "centos-nfv-openvswitch"
259-
# - url: "{{ stackhpc_repo_centos_stream_10_openstack_epoxy_url }}"
260-
# file: "CentOS-OpenStack-epoxy.repo"
261-
# tag: "centos-openstack-epoxy"
259+
- url: "{{ stackhpc_repo_centos_stream_10_openstack_epoxy_url }}"
260+
file: "CentOS-OpenStack-epoxy.repo"
261+
tag: "centos-openstack-epoxy"
262262
- url: "{{ stackhpc_repo_rocky_10_crb_url }}"
263263
file: "rocky.repo"
264264
tag: "crb"
@@ -398,7 +398,9 @@ kolla_build_blocks:
398398
# https://git.centos.org/rpms/rdo-openvswitch/blob/c9s-sig-cloud-openstack-epoxy/f/SPECS/rdo-openvswitch.spec#L10),
399399
# which would replace our NFV OVS and OVN 24.03 LTS with 24.09. Hence exclude RDO OVN/OVS.
400400
&& \
401-
sed -i '/^\[centos-openstack-epoxy\]/a excludepkgs=*rdo-ovn*,*rdo-openvswitch*' /etc/yum.repos.d/CentOS-OpenStack-epoxy.repo \
401+
if [ -f /etc/yum.repos.d/CentOS-OpenStack-epoxy.repo ]; then \
402+
sed -i '/^\[centos-openstack-epoxy\]/a excludepkgs=*rdo-ovn*,*rdo-openvswitch*' /etc/yum.repos.d/CentOS-OpenStack-epoxy.repo; \
403+
fi \
402404
{% endif %}
403405
# With the UCA keyring installed we can now add all repos.
404406
base_ubuntu_package_sources_list: |

0 commit comments

Comments
 (0)