Merge "[eventlet-removal] Remove "logger" mechanism from ML2/OVN CI jobs"
diff --git a/.zuul.yaml b/.zuul.yaml
index 74ce39c..6cf79f5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -311,6 +311,36 @@
- compute1
- compute2
+- nodeset:
+ name: devstack-two-node-debian-bookworm
+ nodes:
+ - name: controller
+ label: debian-bookworm
+ - name: compute1
+ label: debian-bookworm
+ groups:
+ # Node where tests are executed and test results collected
+ - name: tempest
+ nodes:
+ - controller
+ # Nodes running the compute service
+ - name: compute
+ nodes:
+ - controller
+ - compute1
+ # Nodes that are not the controller
+ - name: subnode
+ nodes:
+ - compute1
+ # Switch node for multinode networking setup
+ - name: switch
+ nodes:
+ - controller
+ # Peer nodes for multinode networking setup
+ - name: peers
+ nodes:
+ - compute1
+
- job:
name: devstack-base
parent: openstack-multinode-fips
diff --git a/lib/nova b/lib/nova
index 95ed4d0..810a3d9 100644
--- a/lib/nova
+++ b/lib/nova
@@ -127,6 +127,9 @@
# ``NOVA_VNC_ENABLED`` can be used to forcibly enable VNC configuration.
# In multi-node setups allows compute hosts to not run ``n-novnc``.
NOVA_VNC_ENABLED=$(trueorfalse False NOVA_VNC_ENABLED)
+# same as ``NOVA_VNC_ENABLED`` but for Spice and serial console respectively.
+NOVA_SPICE_ENABLED=$(trueorfalse False NOVA_SPICE_ENABLED)
+NOVA_SERIAL_ENABLED=$(trueorfalse False NOVA_SERIAL_ENABLED)
# Get hypervisor configuration
# ----------------------------
@@ -464,7 +467,7 @@
# only setup database connections and cache backend if there are services
# that require them running on the host. The ensures that n-cpu doesn't
# leak a need to use the db in a multinode scenario.
- if is_service_enabled n-api n-cond n-sched; then
+ if is_service_enabled n-api n-cond n-sched n-spice n-novnc n-sproxy; then
# If we're in multi-tier cells mode, we want our control services pointing
# at cell0 instead of cell1 to ensure isolation. If not, we point everything
# at the main database like normal.
@@ -716,7 +719,7 @@
iniset $NOVA_CPU_CONF vnc enabled false
fi
- if is_service_enabled n-spice; then
+ if is_service_enabled n-spice || [ "$NOVA_SPICE_ENABLED" != False ]; then
# Address on which instance spiceservers will listen on compute hosts.
# For multi-host, this should be the management ip of the compute host.
SPICESERVER_PROXYCLIENT_ADDRESS=${SPICESERVER_PROXYCLIENT_ADDRESS:-$default_proxyclient_addr}
@@ -726,7 +729,7 @@
iniset $NOVA_CPU_CONF spice server_proxyclient_address "$SPICESERVER_PROXYCLIENT_ADDRESS"
fi
- if is_service_enabled n-sproxy; then
+ if is_service_enabled n-sproxy || [ "$NOVA_SERIAL_ENABLED" != False ]; then
iniset $NOVA_CPU_CONF serial_console enabled True
iniset $NOVA_CPU_CONF serial_console base_url "ws://$SERVICE_HOST:$((6082 + offset))/"
fi
diff --git a/lib/tempest b/lib/tempest
index b8f9915..29b01f1 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -514,9 +514,15 @@
iniset $TEMPEST_CONFIG compute-feature-enabled volume_multiattach True
fi
- if is_service_enabled n-novnc; then
+ if is_service_enabled n-novnc || [ "$NOVA_VNC_ENABLED" != False ]; then
iniset $TEMPEST_CONFIG compute-feature-enabled vnc_console True
fi
+ if is_service_enabled n-spice || [ "$NOVA_SPICE_ENABLED" != False ]; then
+ iniset $TEMPEST_CONFIG compute-feature-enabled spice_console True
+ fi
+ if is_service_enabled n-sproxy || [ "$NOVA_SERIAL_ENABLED" != False ]; then
+ iniset $TEMPEST_CONFIG compute-feature-enabled serial_console True
+ fi
# Network
iniset $TEMPEST_CONFIG network project_networks_reachable false