Merge "Fix cloning requirements when GIT_DEPTH is set"
diff --git a/functions-common b/functions-common
index e593328..7042408 100644
--- a/functions-common
+++ b/functions-common
@@ -453,6 +453,7 @@
DISTRO="sle${os_RELEASE%.*}"
elif [[ "$os_VENDOR" =~ (Red.*Hat) || \
"$os_VENDOR" =~ (CentOS) || \
+ "$os_VENDOR" =~ (AlmaLinux) || \
"$os_VENDOR" =~ (Scientific) || \
"$os_VENDOR" =~ (OracleServer) || \
"$os_VENDOR" =~ (Virtuozzo) ]]; then
@@ -518,6 +519,7 @@
[ "$os_VENDOR" = "RedHatEnterpriseServer" ] || \
[ "$os_VENDOR" = "RedHatEnterprise" ] || \
[ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "CentOSStream" ] || \
+ [ "$os_VENDOR" = "AlmaLinux" ] || \
[ "$os_VENDOR" = "OracleServer" ] || [ "$os_VENDOR" = "Virtuozzo" ]
}
diff --git a/lib/neutron b/lib/neutron
index 15d548e..e7719d4 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -146,6 +146,7 @@
# cleanup_neutron() - Remove residual data files, anything left over from previous
# runs that a clean run would need to clean up
function cleanup_neutron_new {
+ deprecated "Using lib/neutron is deprecated, and it will be removed in AA release!"
source $TOP_DIR/lib/neutron_plugins/${NEUTRON_AGENT}_agent
if is_neutron_ovs_base_plugin; then
neutron_ovs_base_cleanup
@@ -169,6 +170,7 @@
# configure_neutron() - Set config files, create data dirs, etc
function configure_neutron_new {
+ deprecated "Using lib/neutron is deprecated, and it will be removed in AA release!"
sudo install -d -o $STACK_USER $NEUTRON_CONF_DIR
(cd $NEUTRON_DIR && exec ./tools/generate_config_file_samples.sh)
@@ -359,6 +361,7 @@
# Takes a single optional argument which is the config file to update,
# if not passed $NOVA_CONF is used.
function configure_neutron_nova_new {
+ deprecated "Using lib/neutron is deprecated, and it will be removed in AA release!"
local conf=${1:-$NOVA_CONF}
iniset $conf neutron auth_type "password"
iniset $conf neutron auth_url "$KEYSTONE_SERVICE_URI"
@@ -385,6 +388,7 @@
# create_neutron_accounts() - Create required service accounts
function create_neutron_accounts_new {
+ deprecated "Using lib/neutron is deprecated, and it will be removed in AA release!"
local neutron_url
if [ "$NEUTRON_DEPLOY_MOD_WSGI" == "True" ]; then
@@ -408,6 +412,7 @@
# init_neutron() - Initialize databases, etc.
function init_neutron_new {
+ deprecated "Using lib/neutron is deprecated, and it will be removed in AA release!"
recreate_database neutron
time_start "dbsync"
@@ -418,6 +423,7 @@
# install_neutron() - Collect source and prepare
function install_neutron_new {
+ deprecated "Using lib/neutron is deprecated, and it will be removed in AA release!"
git_clone $NEUTRON_REPO $NEUTRON_DIR $NEUTRON_BRANCH
setup_develop $NEUTRON_DIR
@@ -491,6 +497,7 @@
# start_neutron() - Start running processes
function start_neutron_new {
+ deprecated "Using lib/neutron is deprecated, and it will be removed in AA release!"
# Start up the neutron agents if enabled
# TODO(sc68cal) Make this pluggable so different DevStack plugins for different Neutron plugins
# can resolve the $NEUTRON_AGENT_BINARY
@@ -528,6 +535,7 @@
# stop_neutron() - Stop running processes
function stop_neutron_new {
+ deprecated "Using lib/neutron is deprecated, and it will be removed in AA release!"
for serv in neutron-api neutron-agent neutron-l3; do
stop_process $serv
done
@@ -550,6 +558,7 @@
# neutron_service_plugin_class_add() - add service plugin class
function neutron_service_plugin_class_add_new {
+ deprecated "Using lib/neutron is deprecated, and it will be removed in AA release!"
local service_plugin_class=$1
local plugins=""
@@ -574,11 +583,13 @@
}
function neutron_server_config_add_new {
+ deprecated "Using lib/neutron is deprecated, and it will be removed in AA release!"
_NEUTRON_SERVER_EXTRA_CONF_FILES_ABS+=($1)
}
# neutron_deploy_rootwrap_filters() - deploy rootwrap filters
function neutron_deploy_rootwrap_filters_new {
+ deprecated "Using lib/neutron is deprecated, and it will be removed in AA release!"
local srcdir=$1
sudo install -d -o root -g root -m 755 $NEUTRON_CONF_DIR/rootwrap.d
sudo install -o root -g root -m 644 $srcdir/etc/neutron/rootwrap.d/*.filters $NEUTRON_CONF_DIR/rootwrap.d
diff --git a/lib/neutron_plugins/services/l3 b/lib/neutron_plugins/services/l3
index ccb5398..a8844c4 100644
--- a/lib/neutron_plugins/services/l3
+++ b/lib/neutron_plugins/services/l3
@@ -305,7 +305,7 @@
local admin_project_id
admin_project_id=$(openstack project list | grep " admin " | get_field 1)
die_if_not_set $LINENO admin_project_id "Failure retrieving project_id for admin"
- local subnet_params="--ip-version 4 --project $admin_project_id"
+ local subnet_params="--ip-version 4 --project $admin_project_id "
subnet_params+="${Q_FLOATING_ALLOCATION_POOL:+--allocation-pool $Q_FLOATING_ALLOCATION_POOL} "
if [[ -n "$PUBLIC_NETWORK_GATEWAY" ]]; then
subnet_params+="--gateway $PUBLIC_NETWORK_GATEWAY "
diff --git a/lib/nova b/lib/nova
index 5a12da6..4f98d4d 100644
--- a/lib/nova
+++ b/lib/nova
@@ -320,8 +320,12 @@
fi
# set chap algorithms. The default chap_algorithm is md5 which will
- # not work under FIPS
- iniset -sudo /etc/iscsi/iscsid.conf DEFAULT "node.session.auth.chap_algs" "SHA3-256,SHA256"
+ # not work under FIPS.
+ # FIXME(alee) For some reason, this breaks openeuler. Openeuler devs should weigh in
+ # and determine the correct solution for openeuler here
+ if ! is_openeuler; then
+ iniset -sudo /etc/iscsi/iscsid.conf DEFAULT "node.session.auth.chap_algs" "SHA3-256,SHA256"
+ fi
# ensure that iscsid is started, even when disabled by default
restart_service iscsid