Skip to content

🌱 Bump OpenStack and Ubuntu in devstack #1721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mdbooth wants to merge 1 commit into from
Closed

🌱 Bump OpenStack and Ubuntu in devstack #1721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions hack/ci/cloud-init/controller.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
VERBOSE=True
LOG_COLOR=True

# Neutron
enable_plugin neutron https://github.com/openstack/neutron stable/${OPENSTACK_RELEASE}

# Octavia
enable_plugin octavia https://github.com/openstack/octavia stable/${OPENSTACK_RELEASE}
enable_plugin octavia-dashboard https://github.com/openstack/octavia-dashboard stable/${OPENSTACK_RELEASE}
Expand All @@ -35,9 +32,20 @@
ENABLED_SERVICES+=,g-api

# Neutron
ENABLED_SERVICES+=,neutron-api,neutron-agent,neutron-dhcp,neutron-l3,neutron-trunk
enable_plugin neutron https://github.com/openstack/neutron stable/${OPENSTACK_RELEASE}
enable_service q-svc
enable_service q-ovn-metadata-agent
enable_service q-trunk
enable_service q-qos
enable_service ovn-controller
enable_service ovn-northd
enable_service ovs-vswitchd
enable_service ovsdb-server

ML2_L3_PLUGIN="ovn-router,trunk,qos"
OVN_L3_CREATE_PUBLIC_NETWORK="True"
PUBLIC_BRIDGE_MTU="1430"

ENABLED_SERVICES+=,neutron-metadata-agent,neutron-qos
# Octavia
ENABLED_SERVICES+=,octavia,o-api,o-cw,o-hm,o-hk,o-da

Expand Down
11 changes: 8 additions & 3 deletions hack/ci/cloud-init/worker.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,17 @@
DATABASE_TYPE=mysql
DATABASE_HOST=$SERVICE_HOST

# Nova
ENABLED_SERVICES=n-cpu,placement-client,c-vol
VOLUME_BACKING_FILE_SIZE=100G

# Neutron
enable_plugin neutron https://github.com/openstack/neutron stable/${OPENSTACK_RELEASE}
enable_service ovn-controller
enable_service q-ovn-metadata-agent
enable_service ovs-vswitchd

# Nova
ENABLED_SERVICES=n-cpu,placement-client,c-vol,neutron-agent
VOLUME_BACKING_FILE_SIZE=100G
OVN_SB_REMOTE=tcp:$SERVICE_HOST:6642

# Additional services
ENABLED_SERVICES+=${OPENSTACK_ADDITIONAL_SERVICES}
Expand Down
7 changes: 1 addition & 6 deletions hack/ci/create_devstack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ source "${scriptdir}/${RESOURCE_TYPE}.sh"

CLUSTER_NAME=${CLUSTER_NAME:-"capo-e2e"}

OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"yoga"}
OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"2023.2"}
OPENSTACK_ENABLE_HORIZON=${OPENSTACK_ENABLE_HORIZON:-"false"}

# Devstack will create a provider network using this range
Expand Down Expand Up @@ -85,11 +85,6 @@ function ensure_openstack_client {

# We explicitly pin to the stable branch version of openstackclient.
curl -L https://releases.openstack.org/constraints/upper/${OPENSTACK_RELEASE} -o /tmp/openstack-constraints

# Hack for yoga only: wrapt <1.14 doesn't support python 3.11
[ "${OPENSTACK_RELEASE}" == "yoga" ] || exit 1 # Delete this hack
sed -i "s/^wrapt===1\.13.*/wrapt===1.14.1/" /tmp/openstack-constraints

pip install -c /tmp/openstack-constraints \
python-openstackclient python-cinderclient \
python-glanceclient python-keystoneclient \
Expand Down
2 changes: 1 addition & 1 deletion hack/ci/gce-project.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function create_vm {
--zone "$GCP_ZONE" \
--enable-nested-virtualization \
--image-project ubuntu-os-cloud \
--image-family ubuntu-2004-lts \
--image-family ubuntu-2204-lts \
--boot-disk-size 200G \
--boot-disk-type pd-ssd \
--can-ip-forward \
Expand Down