Merge "Update glance image size limit"
diff --git a/.zuul.yaml b/.zuul.yaml
index 2fbfa04..74ce39c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -745,8 +745,8 @@
vars:
devstack_localrc:
OVN_BUILD_FROM_SOURCE: True
- OVN_BRANCH: "v21.06.0"
- OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
+ OVN_BRANCH: "branch-24.03"
+ OVS_BRANCH: "branch-3.3"
OVS_SYSCONFDIR: "/usr/local/etc/openvswitch"
- job:
diff --git a/doc/source/guides/multinode-lab.rst b/doc/source/guides/multinode-lab.rst
index 658422b..e6b0b96 100644
--- a/doc/source/guides/multinode-lab.rst
+++ b/doc/source/guides/multinode-lab.rst
@@ -210,6 +210,48 @@
.. _Cells v2: https://docs.openstack.org/nova/latest/user/cells.html
+Configure Tempest Node to run the Tempest tests
+-----------------------------------------------
+
+If there is a need to execute Tempest tests against different Cluster
+Controller node then it can be done by re-using the ``local.conf`` file from
+the Cluster Controller node but with not enabled Controller services in
+``ENABLED_SERVICES`` variable. This variable needs to contain only ``tempest``
+as a configured service. Then variable ``SERVICES_FOR_TEMPEST`` must be
+configured to contain those services that were enabled on the Cluster
+Controller node in the ``ENABLED_SERVICES`` variable. For example the
+``local.conf`` file could look as follows:
+
+::
+
+ [[local|localrc]]
+ HOST_IP=192.168.42.12 # change this per compute node
+ FIXED_RANGE=10.4.128.0/20
+ FLOATING_RANGE=192.168.42.128/25
+ LOGFILE=/opt/stack/logs/stack.sh.log
+ ADMIN_PASSWORD=labstack
+ DATABASE_PASSWORD=supersecret
+ RABBIT_PASSWORD=supersecret
+ SERVICE_PASSWORD=supersecret
+ DATABASE_TYPE=mysql
+ SERVICE_HOST=192.168.42.11
+ MYSQL_HOST=$SERVICE_HOST
+ RABBIT_HOST=$SERVICE_HOST
+ GLANCE_HOSTPORT=$SERVICE_HOST:9292
+ NOVA_VNC_ENABLED=True
+ NOVNCPROXY_URL="http://$SERVICE_HOST:6080/vnc_lite.html"
+ VNCSERVER_LISTEN=$HOST_IP
+ VNCSERVER_PROXYCLIENT_ADDRESS=$VNCSERVER_LISTEN
+ ENABLED_SERVICES=tempest
+ SERVICES_FOR_TEMPEST=keystone,nova,neutron,glance
+
+Then just execute the devstack:
+
+::
+
+ ./stack.sh
+
+
Cleaning Up After DevStack
--------------------------
diff --git a/inc/meta-config b/inc/meta-config
index be73b60..b9d9649 100644
--- a/inc/meta-config
+++ b/inc/meta-config
@@ -90,6 +90,7 @@
local real_configfile
real_configfile=$(eval echo $configfile)
if [ ! -f $real_configfile ]; then
+ mkdir -p $(dirname $real_configfile) || die $LINENO "could not create the directory of $real_configfile ($configfile)"
touch $real_configfile || die $LINENO "could not create config file $real_configfile ($configfile)"
fi
diff --git a/lib/neutron_plugins/ovn_agent b/lib/neutron_plugins/ovn_agent
index be3a9e7..01dc1ed 100644
--- a/lib/neutron_plugins/ovn_agent
+++ b/lib/neutron_plugins/ovn_agent
@@ -28,7 +28,7 @@
OVN_REPO=${OVN_REPO:-https://github.com/ovn-org/ovn.git}
OVN_REPO_NAME=$(basename ${OVN_REPO} | cut -f1 -d'.')
OVN_REPO_NAME=${OVN_REPO_NAME:-ovn}
-OVN_BRANCH=${OVN_BRANCH:-v20.06.1}
+OVN_BRANCH=${OVN_BRANCH:-branch-24.03}
# The commit removing OVN bits from the OVS tree, it is the commit that is not
# present in OVN tree and is used to distinguish if OVN is part of OVS or not.
# https://github.com/openvswitch/ovs/commit/05bf1dbb98b0635a51f75e268ef8aed27601401d
@@ -704,28 +704,23 @@
fi
}
-function _start_ovn_services {
- _start_process "$OVSDB_SERVER_SERVICE"
- _start_process "$OVS_VSWITCHD_SERVICE"
+function _wait_for_ovn_and_set_custom_config {
+ # Wait for the service to be ready
+ # Check for socket and db files for both OVN NB and SB
+ wait_for_sock_file $OVN_RUNDIR/ovnnb_db.sock
+ wait_for_sock_file $OVN_RUNDIR/ovnsb_db.sock
+ wait_for_db_file $OVN_DATADIR/ovnnb_db.db
+ wait_for_db_file $OVN_DATADIR/ovnsb_db.db
- if is_service_enabled ovn-northd ; then
- _start_process "$OVN_NORTHD_SERVICE"
+ if is_service_enabled tls-proxy; then
+ sudo ovn-nbctl --db=unix:$OVN_RUNDIR/ovnnb_db.sock set-ssl $INT_CA_DIR/private/$DEVSTACK_CERT_NAME.key $INT_CA_DIR/$DEVSTACK_CERT_NAME.crt $INT_CA_DIR/ca-chain.pem
+ sudo ovn-sbctl --db=unix:$OVN_RUNDIR/ovnsb_db.sock set-ssl $INT_CA_DIR/private/$DEVSTACK_CERT_NAME.key $INT_CA_DIR/$DEVSTACK_CERT_NAME.crt $INT_CA_DIR/ca-chain.pem
fi
- if is_service_enabled ovn-controller ; then
- _start_process "$OVN_CONTROLLER_SERVICE"
- fi
- if is_service_enabled ovn-controller-vtep ; then
- _start_process "$OVN_CONTROLLER_VTEP_SERVICE"
- fi
- if is_service_enabled ovs-vtep ; then
- _start_process "devstack@ovs-vtep.service"
- fi
- if is_service_enabled q-ovn-metadata-agent neutron-ovn-metadata-agent ; then
- _start_process "devstack@q-ovn-metadata-agent.service"
- fi
- if is_service_enabled q-ovn-agent neutron-ovn-agent ; then
- _start_process "devstack@q-ovn-agent.service"
- fi
+
+ sudo ovn-nbctl --db=unix:$OVN_RUNDIR/ovnnb_db.sock set-connection p${OVN_PROTO}:6641:$SERVICE_LISTEN_ADDRESS -- set connection . inactivity_probe=60000
+ sudo ovn-sbctl --db=unix:$OVN_RUNDIR/ovnsb_db.sock set-connection p${OVN_PROTO}:6642:$SERVICE_LISTEN_ADDRESS -- set connection . inactivity_probe=60000
+ sudo ovs-appctl -t $OVN_RUNDIR/ovnnb_db.ctl vlog/set console:off syslog:$OVN_DBS_LOG_LEVEL file:$OVN_DBS_LOG_LEVEL
+ sudo ovs-appctl -t $OVN_RUNDIR/ovnsb_db.ctl vlog/set console:off syslog:$OVN_DBS_LOG_LEVEL file:$OVN_DBS_LOG_LEVEL
}
# start_ovn() - Start running processes, including screen
@@ -749,21 +744,8 @@
_start_process "$OVN_NORTHD_SERVICE"
fi
- # Wait for the service to be ready
- # Check for socket and db files for both OVN NB and SB
- wait_for_sock_file $OVN_RUNDIR/ovnnb_db.sock
- wait_for_sock_file $OVN_RUNDIR/ovnsb_db.sock
- wait_for_db_file $OVN_DATADIR/ovnnb_db.db
- wait_for_db_file $OVN_DATADIR/ovnsb_db.db
+ _wait_for_ovn_and_set_custom_config
- if is_service_enabled tls-proxy; then
- sudo ovn-nbctl --db=unix:$OVN_RUNDIR/ovnnb_db.sock set-ssl $INT_CA_DIR/private/$DEVSTACK_CERT_NAME.key $INT_CA_DIR/$DEVSTACK_CERT_NAME.crt $INT_CA_DIR/ca-chain.pem
- sudo ovn-sbctl --db=unix:$OVN_RUNDIR/ovnsb_db.sock set-ssl $INT_CA_DIR/private/$DEVSTACK_CERT_NAME.key $INT_CA_DIR/$DEVSTACK_CERT_NAME.crt $INT_CA_DIR/ca-chain.pem
- fi
- sudo ovn-nbctl --db=unix:$OVN_RUNDIR/ovnnb_db.sock set-connection p${OVN_PROTO}:6641:$SERVICE_LISTEN_ADDRESS -- set connection . inactivity_probe=60000
- sudo ovn-sbctl --db=unix:$OVN_RUNDIR/ovnsb_db.sock set-connection p${OVN_PROTO}:6642:$SERVICE_LISTEN_ADDRESS -- set connection . inactivity_probe=60000
- sudo ovs-appctl -t $OVN_RUNDIR/ovnnb_db.ctl vlog/set console:off syslog:$OVN_DBS_LOG_LEVEL file:$OVN_DBS_LOG_LEVEL
- sudo ovs-appctl -t $OVN_RUNDIR/ovnsb_db.ctl vlog/set console:off syslog:$OVN_DBS_LOG_LEVEL file:$OVN_DBS_LOG_LEVEL
fi
if is_service_enabled ovn-controller ; then
@@ -797,8 +779,6 @@
# Format logging
setup_logging $OVN_AGENT_CONF
fi
-
- _start_ovn_services
}
function _stop_ovs_dp {
diff --git a/lib/neutron_plugins/ovs_source b/lib/neutron_plugins/ovs_source
index 75e7d7c..6b6f531 100644
--- a/lib/neutron_plugins/ovs_source
+++ b/lib/neutron_plugins/ovs_source
@@ -20,7 +20,7 @@
OVS_REPO=${OVS_REPO:-https://github.com/openvswitch/ovs.git}
OVS_REPO_NAME=$(basename ${OVS_REPO} | cut -f1 -d'.')
OVS_REPO_NAME=${OVS_REPO_NAME:-ovs}
-OVS_BRANCH=${OVS_BRANCH:-0047ca3a0290f1ef954f2c76b31477cf4b9755f5}
+OVS_BRANCH=${OVS_BRANCH:-branch-3.3}
# Functions
diff --git a/lib/nova b/lib/nova
index 20e19da..95ed4d0 100644
--- a/lib/nova
+++ b/lib/nova
@@ -509,6 +509,10 @@
configure_cinder_access
fi
+ if is_service_enabled manila; then
+ configure_manila_access
+ fi
+
if [ -n "$NOVA_STATE_PATH" ]; then
iniset $NOVA_CONF DEFAULT state_path "$NOVA_STATE_PATH"
iniset $NOVA_CONF oslo_concurrency lock_path "$NOVA_STATE_PATH"
@@ -654,6 +658,18 @@
fi
}
+# Configure access to manila.
+function configure_manila_access {
+ iniset $NOVA_CONF manila os_region_name "$REGION_NAME"
+ iniset $NOVA_CONF manila auth_type "password"
+ iniset $NOVA_CONF manila auth_url "$KEYSTONE_SERVICE_URI"
+ iniset $NOVA_CONF manila username nova
+ iniset $NOVA_CONF manila password "$SERVICE_PASSWORD"
+ iniset $NOVA_CONF manila user_domain_name "$SERVICE_DOMAIN_NAME"
+ iniset $NOVA_CONF manila project_name "$SERVICE_TENANT_NAME"
+ iniset $NOVA_CONF manila project_domain_name "$SERVICE_DOMAIN_NAME"
+}
+
function configure_console_compute {
# If we are running multiple cells (and thus multiple console proxies) on a
# single host, we offset the ports to avoid collisions. We need to
diff --git a/lib/tempest b/lib/tempest
index eeeef67..b8f9915 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -197,6 +197,8 @@
pip_install_gr testrepository
fi
+ local ENABLED_SERVICES=${SERVICES_FOR_TEMPEST:=$ENABLED_SERVICES}
+
local image_lines
local images
local num_images
diff --git a/tools/build_venv.sh b/tools/build_venv.sh
index cfa39a8..a439163 100755
--- a/tools/build_venv.sh
+++ b/tools/build_venv.sh
@@ -38,7 +38,7 @@
fi
# Build new venv
-virtualenv $VENV_DEST
+python$PYTHON3_VERSION -m venv --system-site-packages $VENV_DEST
# Install modern pip
PIP_VIRTUAL_ENV=$VENV_DEST pip_install -U pip