File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 5151 # WORKAROUND:
5252 # https://github.com/kubernetes-sigs/cluster-api-provider-openstack/issues/2320
5353 # OVN built from source using LTS versions. Should be removed once OVS is more stable without the pin.
54- # https://opendev.org/openstack/neutron/src/commit/83de306105f9329e24c97c4af6c3886de20e7d70/ zuul.d/tempest-multinode.yaml#L603-L604
54+ # https://opendev.org/openstack/neutron/src/branch/stable/2026.1/ zuul.d/tempest-multinode.yaml#L601-L611
5555 OVN_BUILD_FROM_SOURCE=True
5656 OVN_BRANCH=branch-24.03
5757 OVS_BRANCH=branch-3.3
9696
9797 [workarounds]
9898 # FIXME(stephenfin): This is temporary while we get to the bottom of
99- # https://bugs.launchpad.net/nova/+bug/2091114 It should not be kept after
100- # we bump to 2025.1
99+ # https://bugs.launchpad.net/nova/+bug/2091114
100+ # It depends more on the flatcar image we use, it should be removed
101+ # once we use an image that includes: https://github.com/flatcar/scripts/pull/2668
101102 disable_deep_image_inspection = True
102103
103104 [[post-config|$CINDER_CONF]]
Original file line number Diff line number Diff line change 4747 # WORKAROUND:
4848 # https://github.com/kubernetes-sigs/cluster-api-provider-openstack/issues/2320
4949 # OVN built from source using LTS versions. Should be removed once OVS is more stable without the pin.
50- # https://opendev.org/openstack/neutron/src/commit/83de306105f9329e24c97c4af6c3886de20e7d70/ zuul.d/tempest-multinode.yaml#L603-L604
50+ # https://opendev.org/openstack/neutron/src/branch/stable/2026.1/ zuul.d/tempest-multinode.yaml#L601-L611
5151 OVN_BUILD_FROM_SOURCE=True
5252 OVN_BRANCH=branch-24.03
5353 OVS_BRANCH=branch-3.3
6262
6363 [workarounds]
6464 # FIXME(stephenfin): This is temporary while we get to the bottom of
65- # https://bugs.launchpad.net/nova/+bug/2091114 It should not be kept after
66- # we bump to 2025.1
65+ # https://bugs.launchpad.net/nova/+bug/2091114
66+ # It depends more on the flatcar image we use, it should be removed
67+ # once we use an image that includes: https://github.com/flatcar/scripts/pull/2668
6768 disable_deep_image_inspection = True
6869
6970 [[post-config|$CINDER_CONF]]
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ source "${scriptdir}/${RESOURCE_TYPE}.sh"
3131
3232CLUSTER_NAME=${CLUSTER_NAME:- " capo-e2e" }
3333
34- OPENSTACK_RELEASE=${OPENSTACK_RELEASE:- " 2025.2 " }
34+ OPENSTACK_RELEASE=${OPENSTACK_RELEASE:- " 2026.1 " }
3535OPENSTACK_ENABLE_HORIZON=${OPENSTACK_ENABLE_HORIZON:- " false" }
3636
3737# Devstack will create a provider network using this range
@@ -181,7 +181,7 @@ function create_devstack {
181181 HOST_IP=" $ip " \
182182 CONTROLLER_IP=" $CONTROLLER_IP " \
183183 FLOATING_RANGE=" $FLOATING_RANGE " \
184- OPENSTACK_DNS_NAMESERVERS=" $OPENSTACK_DNS_NAMESERVERS " \
184+ OPENSTACK_DNS_NAMESERVERS=" $OPENSTACK_DNS_NAMESERVERS " \
185185 MTU=" $( get_mtu) " \
186186 PRIMARY_AZ=" $PRIMARY_AZ " SECONDARY_AZ=" $SECONDARY_AZ " \
187187 envsubst ' ${SSH_PUBLIC_KEY} ${OPENSTACK_ADDITIONAL_SERVICES}
You can’t perform that action at this time.
0 commit comments