Skip to content

Commit

Permalink
devstack: build OVN from source
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
EmilienM committed Dec 11, 2024
1 parent 11e371b commit b79ec20
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
8 changes: 8 additions & 0 deletions hack/ci/cloud-init/controller.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@
OVN_L3_CREATE_PUBLIC_NETWORK="True"
Q_AGENT="ovn"

# WORKAROUND:
# https://github.com/kubernetes-sigs/cluster-api-provider-openstack/issues/2320
# OVN built from source using LTS versions. Should be removed once OVS is more stable without the pin.
# https://opendev.org/openstack/neutron/src/commit/83de306105f9329e24c97c4af6c3886de20e7d70/zuul.d/tempest-multinode.yaml#L603-L604
OVN_BUILD_FROM_SOURCE=True
OVN_BRANCH=branch-24.03
OVS_BRANCH=branch-3.3

# Octavia
ENABLED_SERVICES+=,octavia,o-api,o-cw,o-hm,o-hk,o-da

Expand Down
8 changes: 8 additions & 0 deletions hack/ci/cloud-init/worker.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@
Q_ML2_PLUGIN_MECHANISM_DRIVERS="ovn,logger"
Q_AGENT="ovn"

# WORKAROUND:
# https://github.com/kubernetes-sigs/cluster-api-provider-openstack/issues/2320
# OVN built from source using LTS versions. Should be removed once OVS is more stable without the pin.
# https://opendev.org/openstack/neutron/src/commit/83de306105f9329e24c97c4af6c3886de20e7d70/zuul.d/tempest-multinode.yaml#L603-L604
OVN_BUILD_FROM_SOURCE=True
OVN_BRANCH=branch-24.03
OVS_BRANCH=branch-3.3

# Additional services
ENABLED_SERVICES+=${OPENSTACK_ADDITIONAL_SERVICES}
DISABLED_SERVICES+=${OPENSTACK_DISABLED_SERVICES}
Expand Down

0 comments on commit b79ec20

Please sign in to comment.