Merge "Skip functional tests for .gitreview update"
diff --git a/doc/source/guides/multinode-lab.rst b/doc/source/guides/multinode-lab.rst
index e6b0b96..ef339f1 100644
--- a/doc/source/guides/multinode-lab.rst
+++ b/doc/source/guides/multinode-lab.rst
@@ -24,7 +24,7 @@
::
- apt-get install -y git sudo || yum install -y git sudo
+ apt-get install -y git sudo || dnf install -y git sudo
Network Configuration
---------------------
diff --git a/doc/source/guides/neutron.rst b/doc/source/guides/neutron.rst
index fb36b3e..a7adeef 100644
--- a/doc/source/guides/neutron.rst
+++ b/doc/source/guides/neutron.rst
@@ -451,44 +451,6 @@
'port_security'), set ``Q_ML2_PLUGIN_EXT_DRIVERS`` to blank.
-Using Linux Bridge instead of Open vSwitch
-------------------------------------------
-
-The configuration for using the Linux Bridge ML2 driver is fairly
-straight forward. The Linux Bridge configuration for DevStack is similar
-to the :ref:`Open vSwitch based single interface <single-interface-ovs>`
-setup, with small modifications for the interface mappings.
-
-
-::
-
- [[local|localrc]]
- HOST_IP=172.18.161.6
- SERVICE_HOST=172.18.161.6
- MYSQL_HOST=172.18.161.6
- RABBIT_HOST=172.18.161.6
- GLANCE_HOSTPORT=172.18.161.6:9292
- ADMIN_PASSWORD=secret
- DATABASE_PASSWORD=secret
- RABBIT_PASSWORD=secret
- SERVICE_PASSWORD=secret
-
- ## Neutron options
- Q_USE_SECGROUP=True
- FLOATING_RANGE="172.18.161.0/24"
- IPV4_ADDRS_SAFE_TO_USE="10.0.0.0/24"
- Q_FLOATING_ALLOCATION_POOL=start=172.18.161.250,end=172.18.161.254
- PUBLIC_NETWORK_GATEWAY="172.18.161.1"
- PUBLIC_INTERFACE=eth0
-
- Q_USE_PROVIDERNET_FOR_PUBLIC=True
-
- # Linuxbridge Settings
- Q_AGENT=linuxbridge
- LB_PHYSICAL_INTERFACE=eth0
- PUBLIC_PHYSICAL_NETWORK=default
- LB_INTERFACE_MAPPINGS=default:eth0
-
Using MacVTap instead of Open vSwitch
------------------------------------------
@@ -556,7 +518,7 @@
[[local|localrc]]
...
- Q_ML2_PLUGIN_MECHANISM_DRIVERS=openvswitch,linuxbridge,macvtap
+ Q_ML2_PLUGIN_MECHANISM_DRIVERS=openvswitch,macvtap
...
For the MacVTap compute node, use this local.conf:
diff --git a/doc/source/guides/single-machine.rst b/doc/source/guides/single-machine.rst
index a4385b5..263fbb9 100644
--- a/doc/source/guides/single-machine.rst
+++ b/doc/source/guides/single-machine.rst
@@ -62,7 +62,7 @@
.. code-block:: console
- $ apt-get install sudo -y || yum install -y sudo
+ $ apt-get install sudo -y || dnf install -y sudo
$ echo "stack ALL=(ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/stack
.. note:: On some systems you may need to use ``sudo visudo``.
@@ -81,7 +81,7 @@
.. code-block:: console
- $ sudo apt-get install git -y || sudo yum install -y git
+ $ sudo apt-get install git -y || sudo dnf install -y git
$ git clone https://opendev.org/openstack/devstack
$ cd devstack
diff --git a/doc/source/guides/single-vm.rst b/doc/source/guides/single-vm.rst
index 7dac18b..4272a4b 100644
--- a/doc/source/guides/single-vm.rst
+++ b/doc/source/guides/single-vm.rst
@@ -56,8 +56,8 @@
write_files:
- content: |
#!/bin/sh
- DEBIAN_FRONTEND=noninteractive sudo apt-get -qqy update || sudo yum update -qy
- DEBIAN_FRONTEND=noninteractive sudo apt-get install -qqy git || sudo yum install -qy git
+ DEBIAN_FRONTEND=noninteractive sudo apt-get -qqy update || sudo dnf update -qy
+ DEBIAN_FRONTEND=noninteractive sudo apt-get install -qqy git || sudo dnf install -qy git
sudo chown stack:stack /home/stack
cd /home/stack
git clone https://opendev.org/openstack/devstack
diff --git a/doc/source/networking.rst b/doc/source/networking.rst
index 05b4f34..10e1c3f 100644
--- a/doc/source/networking.rst
+++ b/doc/source/networking.rst
@@ -213,7 +213,7 @@
.. code-block:: bash
- sudo apt-get install sshuttle || yum install sshuttle
+ sudo apt-get install sshuttle || dnf install sshuttle
Finally, start ``sshuttle`` on your localhost using the floating IP address
range. For example, assuming you are using the default value for
diff --git a/doc/source/overview.rst b/doc/source/overview.rst
index 4384081..c978e8d 100644
--- a/doc/source/overview.rst
+++ b/doc/source/overview.rst
@@ -52,12 +52,6 @@
- Apache
-OpenStack Network
------------------
-
-- Neutron: A basic configuration approximating the original FlatDHCP
- mode using linuxbridge or OpenVSwitch.
-
Services
--------
diff --git a/doc/source/plugins.rst b/doc/source/plugins.rst
index dd75b5a..fe567e2 100644
--- a/doc/source/plugins.rst
+++ b/doc/source/plugins.rst
@@ -232,7 +232,7 @@
plugin as files that contain new-line separated lists of packages
required by the plugin
-Supported packaging systems include apt and yum across multiple
+Supported packaging systems include apt and dnf across multiple
distributions. To enable a plugin to hook into this and install
package dependencies, packages may be listed at the following
locations in the top-level of the plugin repository:
diff --git a/files/apache-horizon.template b/files/apache-horizon.template
index da7a7d2..98d02e1 100644
--- a/files/apache-horizon.template
+++ b/files/apache-horizon.template
@@ -10,6 +10,7 @@
DocumentRoot %HORIZON_DIR%/.blackhole/
Alias %WEBROOT%/media %HORIZON_DIR%/openstack_dashboard/static
Alias %WEBROOT%/static %HORIZON_DIR%/static
+ Alias /static %HORIZON_DIR%/static
RedirectMatch "^/$" "%WEBROOT%/"
diff --git a/files/swift/rsyncd.conf b/files/swift/rsyncd.conf
index c49f716..937d6c4 100644
--- a/files/swift/rsyncd.conf
+++ b/files/swift/rsyncd.conf
@@ -6,74 +6,74 @@
[account6612]
max connections = 25
-path = %SWIFT_DATA_DIR%/1/node/
+path = %SWIFT_DATA_DIR%/1/
read only = false
lock file = %SWIFT_DATA_DIR%/run/account6612.lock
[account6622]
max connections = 25
-path = %SWIFT_DATA_DIR%/2/node/
+path = %SWIFT_DATA_DIR%/2/
read only = false
lock file = %SWIFT_DATA_DIR%/run/account6622.lock
[account6632]
max connections = 25
-path = %SWIFT_DATA_DIR%/3/node/
+path = %SWIFT_DATA_DIR%/3/
read only = false
lock file = %SWIFT_DATA_DIR%/run/account6632.lock
[account6642]
max connections = 25
-path = %SWIFT_DATA_DIR%/4/node/
+path = %SWIFT_DATA_DIR%/4/
read only = false
lock file = %SWIFT_DATA_DIR%/run/account6642.lock
[container6611]
max connections = 25
-path = %SWIFT_DATA_DIR%/1/node/
+path = %SWIFT_DATA_DIR%/1/
read only = false
lock file = %SWIFT_DATA_DIR%/run/container6611.lock
[container6621]
max connections = 25
-path = %SWIFT_DATA_DIR%/2/node/
+path = %SWIFT_DATA_DIR%/2/
read only = false
lock file = %SWIFT_DATA_DIR%/run/container6621.lock
[container6631]
max connections = 25
-path = %SWIFT_DATA_DIR%/3/node/
+path = %SWIFT_DATA_DIR%/3/
read only = false
lock file = %SWIFT_DATA_DIR%/run/container6631.lock
[container6641]
max connections = 25
-path = %SWIFT_DATA_DIR%/4/node/
+path = %SWIFT_DATA_DIR%/4/
read only = false
lock file = %SWIFT_DATA_DIR%/run/container6641.lock
[object6613]
max connections = 25
-path = %SWIFT_DATA_DIR%/1/node/
+path = %SWIFT_DATA_DIR%/1/
read only = false
lock file = %SWIFT_DATA_DIR%/run/object6613.lock
[object6623]
max connections = 25
-path = %SWIFT_DATA_DIR%/2/node/
+path = %SWIFT_DATA_DIR%/2/
read only = false
lock file = %SWIFT_DATA_DIR%/run/object6623.lock
[object6633]
max connections = 25
-path = %SWIFT_DATA_DIR%/3/node/
+path = %SWIFT_DATA_DIR%/3/
read only = false
lock file = %SWIFT_DATA_DIR%/run/object6633.lock
[object6643]
max connections = 25
-path = %SWIFT_DATA_DIR%/4/node/
+path = %SWIFT_DATA_DIR%/4/
read only = false
lock file = %SWIFT_DATA_DIR%/run/object6643.lock
diff --git a/lib/apache b/lib/apache
index fc174f3..744c0f1 100644
--- a/lib/apache
+++ b/lib/apache
@@ -53,13 +53,16 @@
# Enable apache mod and restart apache if it isn't already enabled.
function enable_apache_mod {
local mod=$1
+ local should_restart=$2
# Apache installation, because we mark it NOPRIME
if is_ubuntu; then
# Skip mod_version as it is not a valid mod to enable
# on debuntu, instead it is built in.
if [[ "$mod" != "version" ]] && ! a2query -m $mod ; then
sudo a2enmod $mod
- restart_apache_server
+ if [[ "$should_restart" != "norestart" ]] ; then
+ restart_apache_server
+ fi
fi
elif is_fedora; then
# pass
@@ -113,15 +116,13 @@
fi
if is_ubuntu; then
- # we've got to enable proxy and proxy_uwsgi for this to work
- sudo a2enmod proxy
- sudo a2enmod proxy_uwsgi
- elif is_fedora; then
- # redhat is missing a nice way to turn on/off modules
- echo "LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so" \
- | sudo tee /etc/httpd/conf.modules.d/02-proxy-uwsgi.conf
+ if ! a2query -m proxy || ! a2query -m proxy_uwsgi ; then
+ # we've got to enable proxy and proxy_uwsgi for this to work
+ sudo a2enmod proxy
+ sudo a2enmod proxy_uwsgi
+ restart_apache_server
+ fi
fi
- restart_apache_server
}
# install_apache_wsgi() - Install Apache server and wsgi module
diff --git a/lib/atop b/lib/atop
index e0b14cb..25c8e9a 100644
--- a/lib/atop
+++ b/lib/atop
@@ -19,7 +19,8 @@
set +o xtrace
function configure_atop {
- cat <<EOF | sudo tee /etc/default/atop >/dev/null
+ mkdir -p $LOGDIR/atop
+ cat <<EOF | sudo tee /etc/default/atop >/dev/null
# /etc/default/atop
# see man atoprc for more possibilities to configure atop execution
diff --git a/lib/glance b/lib/glance
index 4e51910..b596b53 100644
--- a/lib/glance
+++ b/lib/glance
@@ -446,10 +446,6 @@
iniset $GLANCE_CACHE_CONF DEFAULT use_syslog $SYSLOG
iniset $GLANCE_CACHE_CONF DEFAULT image_cache_dir $GLANCE_CACHE_DIR/
iniset $GLANCE_CACHE_CONF DEFAULT image_cache_driver $GLANCE_CACHE_DRIVER
- iniset $GLANCE_CACHE_CONF DEFAULT auth_url $KEYSTONE_SERVICE_URI
- iniset $GLANCE_CACHE_CONF DEFAULT admin_tenant_name $SERVICE_PROJECT_NAME
- iniset $GLANCE_CACHE_CONF DEFAULT admin_user glance
- iniset $GLANCE_CACHE_CONF DEFAULT admin_password $SERVICE_PASSWORD
# Store specific confs
iniset $GLANCE_CACHE_CONF glance_store filesystem_store_datadir $GLANCE_IMAGE_DIR/
diff --git a/lib/keystone b/lib/keystone
index 76e2598..8371045 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -592,7 +592,7 @@
# create_ldap_domain() - Create domain file and initialize domain with a user
function create_ldap_domain {
# Creates domain Users
- openstack --os-identity-api-version=3 domain create --description "LDAP domain" Users
+ openstack domain create --description "LDAP domain" Users
# Create domain file inside etc/keystone/domains
KEYSTONE_LDAP_DOMAIN_FILE=$KEYSTONE_CONF_DIR/domains/keystone.Users.conf
diff --git a/lib/libraries b/lib/libraries
index 9d5d655..26254c7 100755
--- a/lib/libraries
+++ b/lib/libraries
@@ -131,12 +131,7 @@
# python client libraries we might need from git can go here
_install_lib_from_source "python-barbicanclient"
-
# etcd (because tooz does not have a hard dependency on these)
- #
- # NOTE(sdague): this is currently a work around because tooz
- # doesn't pull in etcd3.
- pip_install etcd3
pip_install etcd3gw
}
diff --git a/lib/neutron b/lib/neutron
index bcef8a5..69ff212 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -241,8 +241,7 @@
# If using VLANs for tenant networks, or if using flat or VLAN
# provider networks, set in ``localrc`` to the name of the physical
# network, and also configure ``OVS_PHYSICAL_BRIDGE`` for the
-# openvswitch agent or ``LB_PHYSICAL_INTERFACE`` for the linuxbridge
-# agent, as described below.
+# openvswitch agent, as described below.
#
# Example: ``PHYSICAL_NETWORK=default``
PHYSICAL_NETWORK=${PHYSICAL_NETWORK:-public}
@@ -257,18 +256,6 @@
# Example: ``OVS_PHYSICAL_BRIDGE=br-eth1``
OVS_PHYSICAL_BRIDGE=${OVS_PHYSICAL_BRIDGE:-br-ex}
-# With the linuxbridge agent, if using VLANs for tenant networks,
-# or if using flat or VLAN provider networks, set in ``localrc`` to
-# the name of the network interface to use for the physical
-# network.
-#
-# Example: ``LB_PHYSICAL_INTERFACE=eth1``
-if [[ $Q_AGENT == "linuxbridge" && -z ${LB_PHYSICAL_INTERFACE} ]]; then
- default_route_dev=$( (ip route; ip -6 route) | grep ^default | head -n 1 | awk '{print $5}')
- die_if_not_set $LINENO default_route_dev "Failure retrieving default route device"
- LB_PHYSICAL_INTERFACE=$default_route_dev
-fi
-
# With the openvswitch plugin, set to True in ``localrc`` to enable
# provider GRE tunnels when ``ENABLE_TENANT_TUNNELS`` is False.
#
@@ -889,10 +876,6 @@
neutron_ovs_base_cleanup
fi
- if [[ $Q_AGENT == "linuxbridge" ]]; then
- neutron_lb_cleanup
- fi
-
# delete all namespaces created by neutron
for ns in $(sudo ip netns list | grep -o -E '(qdhcp|qrouter|fip|snat)-[0-9a-f-]*'); do
sudo ip netns delete ${ns}
diff --git a/lib/neutron_plugins/linuxbridge_agent b/lib/neutron_plugins/linuxbridge_agent
deleted file mode 100644
index a392bd0..0000000
--- a/lib/neutron_plugins/linuxbridge_agent
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/bash
-#
-# Neutron Linux Bridge L2 agent
-# -----------------------------
-
-# Save trace setting
-_XTRACE_NEUTRON_LB=$(set +o | grep xtrace)
-set +o xtrace
-
-function neutron_lb_cleanup {
- sudo ip link delete $PUBLIC_BRIDGE
-
- bridge_list=`ls /sys/class/net/*/bridge/bridge_id 2>/dev/null | cut -f5 -d/`
- if [[ -z "$bridge_list" ]]; then
- return
- fi
- if [[ "$Q_ML2_TENANT_NETWORK_TYPE" = "vxlan" ]]; then
- for port in $(echo $bridge_list | grep -o -e [a-zA-Z\-]*tap[0-9a-f\-]* -e vxlan-[0-9a-f\-]*); do
- sudo ip link delete $port
- done
- elif [[ "$Q_ML2_TENANT_NETWORK_TYPE" = "vlan" ]]; then
- for port in $(echo $bridge_list | grep -o -e [a-zA-Z\-]*tap[0-9a-f\-]* -e ${LB_PHYSICAL_INTERFACE}\.[0-9a-f\-]*); do
- sudo ip link delete $port
- done
- fi
- for bridge in $(echo $bridge_list |grep -o -e brq[0-9a-f\-]*); do
- sudo ip link delete $bridge
- done
-}
-
-function is_neutron_ovs_base_plugin {
- # linuxbridge doesn't use OVS
- return 1
-}
-
-function neutron_plugin_create_nova_conf {
- :
-}
-
-function neutron_plugin_install_agent_packages {
- :
-}
-
-function neutron_plugin_configure_dhcp_agent {
- local conf_file=$1
- :
-}
-
-function neutron_plugin_configure_l3_agent {
- local conf_file=$1
- sudo ip link add $PUBLIC_BRIDGE type bridge
- set_mtu $PUBLIC_BRIDGE $PUBLIC_BRIDGE_MTU
-}
-
-function neutron_plugin_configure_plugin_agent {
- # Setup physical network interface mappings. Override
- # ``LB_VLAN_RANGES`` and ``LB_INTERFACE_MAPPINGS`` in ``localrc`` for more
- # complex physical network configurations.
- if [[ "$LB_INTERFACE_MAPPINGS" == "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]] && [[ "$LB_PHYSICAL_INTERFACE" != "" ]]; then
- LB_INTERFACE_MAPPINGS=$PHYSICAL_NETWORK:$LB_PHYSICAL_INTERFACE
- fi
- if [[ "$PUBLIC_BRIDGE" != "" ]] && [[ "$PUBLIC_PHYSICAL_NETWORK" != "" ]]; then
- if is_service_enabled q-l3 || is_service_enabled neutron-l3; then
- iniset /$Q_PLUGIN_CONF_FILE linux_bridge bridge_mappings "$PUBLIC_PHYSICAL_NETWORK:$PUBLIC_BRIDGE"
- fi
- fi
- if [[ "$LB_INTERFACE_MAPPINGS" != "" ]]; then
- iniset /$Q_PLUGIN_CONF_FILE linux_bridge physical_interface_mappings $LB_INTERFACE_MAPPINGS
- fi
- if [[ "$Q_USE_SECGROUP" == "True" ]]; then
- iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
- if ! running_in_container; then
- enable_kernel_bridge_firewall
- fi
- else
- iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver
- fi
- AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-linuxbridge-agent"
- iniset /$Q_PLUGIN_CONF_FILE agent tunnel_types $Q_TUNNEL_TYPES
-
- # Configure vxlan tunneling
- if [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then
- if [[ "$Q_ML2_TENANT_NETWORK_TYPE" == "vxlan" ]]; then
- iniset /$Q_PLUGIN_CONF_FILE vxlan enable_vxlan "True"
- iniset /$Q_PLUGIN_CONF_FILE vxlan local_ip $TUNNEL_ENDPOINT_IP
- else
- iniset /$Q_PLUGIN_CONF_FILE vxlan enable_vxlan "False"
- fi
- else
- iniset /$Q_PLUGIN_CONF_FILE vxlan enable_vxlan "False"
- fi
-}
-
-function neutron_plugin_setup_interface_driver {
- local conf_file=$1
- iniset $conf_file DEFAULT interface_driver linuxbridge
-}
-
-function neutron_plugin_check_adv_test_requirements {
- is_service_enabled q-agt neutron-agent && is_service_enabled q-dhcp neutron-dhcp && return 0
-}
-
-# Restore xtrace
-$_XTRACE_NEUTRON_LB
diff --git a/lib/neutron_plugins/ml2 b/lib/neutron_plugins/ml2
index c2e78c6..687167b 100644
--- a/lib/neutron_plugins/ml2
+++ b/lib/neutron_plugins/ml2
@@ -114,9 +114,6 @@
populate_ml2_config /$Q_PLUGIN_CONF_FILE securitygroup enable_security_group=$Q_USE_SECGROUP
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 mechanism_drivers=$Q_ML2_PLUGIN_MECHANISM_DRIVERS
- if [[ "$Q_ML2_PLUGIN_MECHANISM_DRIVERS" == *"linuxbridge"* ]]; then
- iniset $NEUTRON_CONF experimental linuxbridge True
- fi
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 overlay_ip_version=$TUNNEL_IP_VERSION
if [[ -n "$Q_ML2_PLUGIN_TYPE_DRIVERS" ]]; then
diff --git a/lib/neutron_plugins/services/l3 b/lib/neutron_plugins/services/l3
index c6d4663..bbedc57 100644
--- a/lib/neutron_plugins/services/l3
+++ b/lib/neutron_plugins/services/l3
@@ -334,16 +334,6 @@
local ext_gw_interface="none"
if is_neutron_ovs_base_plugin; then
ext_gw_interface=$(_neutron_get_ext_gw_interface)
- elif [[ "$Q_AGENT" = "linuxbridge" ]]; then
- # Get the device the neutron router and network for $FIXED_RANGE
- # will be using.
- if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" = "True" ]; then
- # in provider nets a bridge mapping uses the public bridge directly
- ext_gw_interface=$PUBLIC_BRIDGE
- else
- # e.x. brq3592e767-da for NET_ID 3592e767-da66-4bcb-9bec-cdb03cd96102
- ext_gw_interface=brq${EXT_NET_ID:0:11}
- fi
fi
if [[ "$ext_gw_interface" != "none" ]]; then
local cidr_len=${FLOATING_RANGE#*/}
diff --git a/lib/swift b/lib/swift
index 3659624..8629274 100644
--- a/lib/swift
+++ b/lib/swift
@@ -318,8 +318,8 @@
iniuncomment ${swift_node_config} DEFAULT mount_check
iniset ${swift_node_config} DEFAULT mount_check false
- iniuncomment ${swift_node_config} ${server_type}-replicator vm_test_mode
- iniset ${swift_node_config} ${server_type}-replicator vm_test_mode yes
+ iniuncomment ${swift_node_config} ${server_type}-replicator rsync_module
+ iniset ${swift_node_config} ${server_type}-replicator rsync_module "{replication_ip}::${server_type}{replication_port}"
# Using a sed and not iniset/iniuncomment because we want to a global
# modification and make sure it works for new sections.
diff --git a/lib/tempest b/lib/tempest
index 29b01f1..c9486f6 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -586,6 +586,7 @@
TEMPEST_VOLUME_REVERT_TO_SNAPSHOT=${TEMPEST_VOLUME_REVERT_TO_SNAPSHOT:-True}
fi
iniset $TEMPEST_CONFIG volume-feature-enabled volume_revert $(trueorfalse False TEMPEST_VOLUME_REVERT_TO_SNAPSHOT)
+ iniset $TEMPEST_CONFIG volume-feature-enabled extend_attached_encrypted_volume ${TEMPEST_EXTEND_ATTACHED_ENCRYPTED_VOLUME:-False}
if [[ "$CINDER_BACKUP_DRIVER" == *"swift"* ]]; then
iniset $TEMPEST_CONFIG volume backup_driver swift
fi
diff --git a/lib/tls b/lib/tls
index 0a598e1..cff5c63 100644
--- a/lib/tls
+++ b/lib/tls
@@ -452,6 +452,7 @@
# ===============
function tune_apache_connections {
+ local should_restart=$1
local tuning_file=$APACHE_SETTINGS_DIR/connection-tuning.conf
if ! [ -f $tuning_file ] ; then
sudo bash -c "cat > $tuning_file" << EOF
@@ -494,7 +495,12 @@
MaxRequestsPerChild 0
</IfModule>
EOF
- restart_apache_server
+ if [ "$should_restart" != "norestart" ] ; then
+ # Only restart the apache server if we know we really want to
+ # do so. Too many restarts in a short period of time is treated
+ # as an error by systemd.
+ restart_apache_server
+ fi
fi
}
@@ -509,7 +515,8 @@
# 8190 is the default apache size.
local f_header_size=${6:-8190}
- tune_apache_connections
+ # We don't restart apache here as we'll do it at the end of the function.
+ tune_apache_connections norestart
local config_file
config_file=$(apache_site_config_for $b_service)
@@ -558,7 +565,9 @@
</VirtualHost>
EOF
for mod in headers ssl proxy proxy_http; do
- enable_apache_mod $mod
+ # We don't need to restart here as we will restart once at the end
+ # of the function.
+ enable_apache_mod $mod norestart
done
enable_apache_site $b_service
restart_apache_server
diff --git a/openrc b/openrc
index 5ec7634..e800abe 100644
--- a/openrc
+++ b/openrc
@@ -72,8 +72,3 @@
export OS_CACERT=$DEFAULT_OS_CACERT
fi
fi
-
-# Currently cinderclient needs you to specify the *volume api* version. This
-# needs to match the config of your catalog returned by Keystone.
-export CINDER_VERSION=${CINDER_VERSION:-3}
-export OS_VOLUME_API_VERSION=${OS_VOLUME_API_VERSION:-$CINDER_VERSION}
diff --git a/stackrc b/stackrc
index c05d4e2..0319fc8 100644
--- a/stackrc
+++ b/stackrc
@@ -252,7 +252,7 @@
# Setting the variable to 'ALL' will activate the download for all
# libraries.
-DEVSTACK_SERIES="2025.1"
+DEVSTACK_SERIES="2025.2"
##############
#
diff --git a/tools/update_clouds_yaml.py b/tools/update_clouds_yaml.py
index 74dcdb2..87312d9 100755
--- a/tools/update_clouds_yaml.py
+++ b/tools/update_clouds_yaml.py
@@ -14,14 +14,14 @@
# Update the clouds.yaml file.
-
import argparse
import os.path
+import sys
import yaml
-class UpdateCloudsYaml(object):
+class UpdateCloudsYaml:
def __init__(self, args):
if args.file:
self._clouds_path = args.file
@@ -35,25 +35,26 @@
self._cloud = args.os_cloud
self._cloud_data = {
'region_name': args.os_region_name,
- 'identity_api_version': args.os_identity_api_version,
- 'volume_api_version': args.os_volume_api_version,
'auth': {
'auth_url': args.os_auth_url,
'username': args.os_username,
+ 'user_domain_id': 'default',
'password': args.os_password,
},
}
+
if args.os_project_name and args.os_system_scope:
print(
- "WARNING: os_project_name and os_system_scope were both"
- " given. os_system_scope will take priority.")
- if args.os_project_name and not args.os_system_scope:
- self._cloud_data['auth']['project_name'] = args.os_project_name
- if args.os_identity_api_version == '3' and not args.os_system_scope:
- self._cloud_data['auth']['user_domain_id'] = 'default'
- self._cloud_data['auth']['project_domain_id'] = 'default'
- if args.os_system_scope:
+ "WARNING: os_project_name and os_system_scope were both "
+ "given. os_system_scope will take priority."
+ )
+
+ if args.os_system_scope: # system-scoped
self._cloud_data['auth']['system_scope'] = args.os_system_scope
+ elif args.os_project_name: # project-scoped
+ self._cloud_data['auth']['project_name'] = args.os_project_name
+ self._cloud_data['auth']['project_domain_id'] = 'default'
+
if args.os_cacert:
self._cloud_data['cacert'] = args.os_cacert
@@ -89,8 +90,6 @@
parser.add_argument('--file')
parser.add_argument('--os-cloud', required=True)
parser.add_argument('--os-region-name', default='RegionOne')
- parser.add_argument('--os-identity-api-version', default='3')
- parser.add_argument('--os-volume-api-version', default='3')
parser.add_argument('--os-cacert')
parser.add_argument('--os-auth-url', required=True)
parser.add_argument('--os-username', required=True)
diff --git a/tools/worlddump.py b/tools/worlddump.py
index edbfa26..26ced3f 100755
--- a/tools/worlddump.py
+++ b/tools/worlddump.py
@@ -31,7 +31,6 @@
'nova-compute',
'neutron-dhcp-agent',
'neutron-l3-agent',
- 'neutron-linuxbridge-agent',
'neutron-metadata-agent',
'neutron-openvswitch-agent',
'cinder-volume',