Skip to content

Commit 959a7c2

Browse files
jharbottyoctozepto
authored andcommitted
Enable running on Debian Bullseye
Some adaption in database handling is all that is missing. Also add a platform job that tests this. Co-Authored-By: Radosław Piliszek <radoslaw.piliszek@gmail.com> Change-Id: I6dd3e48444dd415d84df5e7f5c74540847cdd6db
1 parent 982b03c commit 959a7c2

File tree

3 files changed

+58
-2
lines changed

3 files changed

+58
-2
lines changed

.zuul.yaml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,16 @@
8686
nodes:
8787
- controller
8888

89+
- nodeset:
90+
name: devstack-single-node-debian-bullseye
91+
nodes:
92+
- name: controller
93+
label: debian-bullseye
94+
groups:
95+
- name: tempest
96+
nodes:
97+
- controller
98+
8999
- nodeset:
90100
name: openstack-two-node
91101
nodes:
@@ -613,6 +623,49 @@
613623
vars:
614624
configure_swap_size: 4096
615625

626+
- job:
627+
name: devstack-platform-debian-bullseye
628+
parent: tempest-full-py3
629+
description: Debian Bullseye platform test
630+
nodeset: devstack-single-node-debian-bullseye
631+
voting: false
632+
timeout: 9000
633+
vars:
634+
# NOTE(yoctozepto): With concurrency equal 2, there is a random event
635+
# that this job will run out of memory at some point.
636+
tempest_concurrency: 1
637+
# NOTE(yoctozepto): Debian Bullseye does not yet offer OVN. Switch to OVS
638+
# for the time being.
639+
devstack_localrc:
640+
Q_AGENT: openvswitch
641+
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
642+
Q_ML2_TENANT_NETWORK_TYPE: vxlan
643+
devstack_services:
644+
# Disable OVN services
645+
ovn-northd: false
646+
ovn-controller: false
647+
ovs-vswitchd: false
648+
ovsdb-server: false
649+
# Disable Neutron ML2/OVN services
650+
q-ovn-metadata-agent: false
651+
# Enable Neutron ML2/OVS services
652+
q-agt: true
653+
q-dhcp: true
654+
q-l3: true
655+
q-meta: true
656+
q-metering: true
657+
group-vars:
658+
subnode:
659+
devstack_services:
660+
# Disable OVN services
661+
ovn-controller: false
662+
ovs-vswitchd: false
663+
ovsdb-server: false
664+
# Disable Neutron ML2/OVN services
665+
q-ovn-metadata-agent: false
666+
# Enable Neutron ML2/OVS services
667+
q-agt: true
668+
616669
- job:
617670
name: devstack-no-tls-proxy
618671
parent: tempest-full-py3
@@ -716,6 +769,7 @@
716769
- devstack-enforce-scope
717770
- devstack-platform-fedora-latest
718771
- devstack-platform-centos-8-stream
772+
- devstack-platform-debian-bullseye
719773
- devstack-multinode
720774
- devstack-unit-tests
721775
- openstack-tox-bashate

lib/databases/mysql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ if [[ -z "$MYSQL_SERVICE_NAME" ]]; then
2525
# provide a mysql.service symlink for backwards-compatibility, but
2626
# let's not rely on that.
2727
MYSQL_SERVICE_NAME=mariadb
28+
elif [[ "$DISTRO" == "bullseye" ]]; then
29+
MYSQL_SERVICE_NAME=mariadb
2830
fi
2931
fi
3032

@@ -105,7 +107,7 @@ function configure_database_mysql {
105107
# In mariadb e.g. on Ubuntu socket plugin is used for authentication
106108
# as root so it works only as sudo. To restore old "mysql like" behaviour,
107109
# we need to change auth plugin for root user
108-
if is_ubuntu && [ "$MYSQL_SERVICE_NAME" == "mariadb" ]; then
110+
if is_ubuntu && [[ "$DISTRO" != "bullseye" ]] && [ "$MYSQL_SERVICE_NAME" == "mariadb" ]; then
109111
sudo mysql $cmd_args -e "UPDATE mysql.user SET plugin='' WHERE user='$DATABASE_USER' AND host='localhost';"
110112
sudo mysql $cmd_args -e "FLUSH PRIVILEGES;"
111113
fi

stack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ write_devstack_version
227227

228228
# Warn users who aren't on an explicitly supported distro, but allow them to
229229
# override check and attempt installation with ``FORCE=yes ./stack``
230-
SUPPORTED_DISTROS="focal|f34|opensuse-15.2|opensuse-tumbleweed|rhel8"
230+
SUPPORTED_DISTROS="bullseye|focal|f34|opensuse-15.2|opensuse-tumbleweed|rhel8"
231231

232232
if [[ ! ${DISTRO} =~ $SUPPORTED_DISTROS ]]; then
233233
echo "WARNING: this script has not been tested on $DISTRO"

0 commit comments

Comments
 (0)