diff --git a/etc/kayobe/cephadm.yml b/etc/kayobe/cephadm.yml index b8672272e..d8f7e54f7 100644 --- a/etc/kayobe/cephadm.yml +++ b/etc/kayobe/cephadm.yml @@ -12,7 +12,7 @@ cephadm_ceph_release: "quincy" cephadm_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/ceph:{{ cephadm_image_tag }}" # Ceph container image tag. -cephadm_image_tag: "v17.2.6" +cephadm_image_tag: "v17.2.7" # Ceph custom repo workaround for Ubuntu Jammy as there are no official ceph repos for jammy. cephadm_custom_repos: "{{ ansible_facts['distribution_release'] == 'jammy' }}" diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 35ba5523e..84e582006 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -289,18 +289,22 @@ kolla_build_blocks: {% if stackhpc_kolla_clean_up_repo_mirrors | bool %} {% if kolla_base_distro == '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 \ - echo "Found repository mirror in Yum repositories"; \ - exit 1; \ + if [ -f /etc/yum.repos.d.backup/repos.tar.gz ]; then \ + tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d && \ + rm -rf /etc/yum.repos.d.backup/; \ fi && \ - rm -rf /etc/yum.repos.d.backup/ + if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/yum.repos.d; then \ + echo "Found repository mirror in Yum repositories"; \ + exit 1; \ + fi {% else %} RUN \ - mv /etc/apt/sources.list.backup /etc/apt/sources.list && \ + if [ -f /etc/apt/sources.list.backup ]; then \ + mv /etc/apt/sources.list.backup /etc/apt/sources.list; \ + fi && \ if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/apt/sources.list; then \ - echo "Found repository mirror in APT repositories"; \ - exit 1; \ + echo "Found repository mirror in APT repositories"; \ + exit 1; \ fi {% endif %} {% endif %} diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 65df749bb..83e919339 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -23,11 +23,15 @@ kayobe_image_tags: cloudkitty: rocky: zed-rocky-9-20231114T124701 ubuntu: zed-ubuntu-jammy-20231114T124701 + neutron: + rocky: zed-rocky-9-20231115T094053 + ubuntu: zed-ubuntu-jammy-20231115T094053 openstack_tag: "{% raw %}{{ kayobe_image_tags['openstack'][kolla_base_distro] }}{% endraw %}" bifrost_tag: "{% raw %}{{ kayobe_image_tags['bifrost'][kolla_base_distro] }}{% endraw %}" ovn_tag: "{% raw %}{{ kayobe_image_tags['ovn'][kolla_base_distro] }}{% endraw %}" -cliudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][kolla_base_distro] }}{% endraw %}" +cloudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][kolla_base_distro] }}{% endraw %}" +neutron_tag: "{% raw %}{{ kayobe_image_tags['neutron'][kolla_base_distro] }}{% endraw %}" om_enable_rabbitmq_high_availability: true diff --git a/releasenotes/notes/bump-ceph-images-f9d4721aa1d37729.yaml b/releasenotes/notes/bump-ceph-images-f9d4721aa1d37729.yaml new file mode 100644 index 000000000..439f8b842 --- /dev/null +++ b/releasenotes/notes/bump-ceph-images-f9d4721aa1d37729.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Updates default Ceph images to v17.2.7 for Quincy. diff --git a/releasenotes/notes/fix-lb-fip-issue-when-neutron-restarts-6aafd03d115a1ee4.yaml b/releasenotes/notes/fix-lb-fip-issue-when-neutron-restarts-6aafd03d115a1ee4.yaml new file mode 100644 index 000000000..dc5f3c2bf --- /dev/null +++ b/releasenotes/notes/fix-lb-fip-issue-when-neutron-restarts-6aafd03d115a1ee4.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes Neutron so that load balancer FIPs are not broken on Neutron restart. + See `Neutron bug report + `__. diff --git a/releasenotes/notes/fix-regression-plugging-802-3ad-port-group-cd48d2e6f43b363f.yaml b/releasenotes/notes/fix-regression-plugging-802-3ad-port-group-cd48d2e6f43b363f.yaml new file mode 100644 index 000000000..bec2cafb8 --- /dev/null +++ b/releasenotes/notes/fix-regression-plugging-802-3ad-port-group-cd48d2e6f43b363f.yaml @@ -0,0 +1,9 @@ +--- +fixes: + - | + Fixes issue where Netmiko devices were sending no commands to the switch + since plug_bond_to_network is overridden in + networking_generic_switch/devices/netmiko_devices/init.py and + PLUG_BOND_TO_NETWORK to set to None. + See `NGS bug report + `__.