Skip to content

Commit b79ec20

Browse files
committed
devstack: build OVN from source
In this PR we'll control the version of OVN to align with the upstream devstack jobs building OVN and OVS from LTS versions. This is largely a workaround to address some timeout issues that we recently have and that with a controlled version of OVN we hope to reduce.
1 parent 11e371b commit b79ec20

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

hack/ci/cloud-init/controller.yaml.tpl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@
4848
OVN_L3_CREATE_PUBLIC_NETWORK="True"
4949
Q_AGENT="ovn"
5050

51+
# WORKAROUND:
52+
# https://github.com/kubernetes-sigs/cluster-api-provider-openstack/issues/2320
53+
# 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
55+
OVN_BUILD_FROM_SOURCE=True
56+
OVN_BRANCH=branch-24.03
57+
OVS_BRANCH=branch-3.3
58+
5159
# Octavia
5260
ENABLED_SERVICES+=,octavia,o-api,o-cw,o-hm,o-hk,o-da
5361

hack/ci/cloud-init/worker.yaml.tpl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@
4444
Q_ML2_PLUGIN_MECHANISM_DRIVERS="ovn,logger"
4545
Q_AGENT="ovn"
4646

47+
# WORKAROUND:
48+
# https://github.com/kubernetes-sigs/cluster-api-provider-openstack/issues/2320
49+
# 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
51+
OVN_BUILD_FROM_SOURCE=True
52+
OVN_BRANCH=branch-24.03
53+
OVS_BRANCH=branch-3.3
54+
4755
# Additional services
4856
ENABLED_SERVICES+=${OPENSTACK_ADDITIONAL_SERVICES}
4957
DISABLED_SERVICES+=${OPENSTACK_DISABLED_SERVICES}

0 commit comments

Comments
 (0)