Merge "Fix mysqladmin failure for Fedora 34 and mariadb"
diff --git a/.zuul.yaml b/.zuul.yaml
index 272018f..248a56b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -442,7 +442,7 @@
PUBLIC_BRIDGE_MTU: '{{ external_bridge_mtu }}'
devstack_services:
# Shared services
- dstat: true
+ dstat: false
etcd3: true
memory_tracker: true
mysql: true
@@ -451,7 +451,7 @@
subnode:
devstack_services:
# Shared services
- dstat: true
+ dstat: false
memory_tracker: true
devstack_localrc:
# Multinode specific settings
@@ -517,7 +517,7 @@
# Core services enabled for this branch.
# This list replaces the test-matrix.
# Shared services
- dstat: true
+ dstat: false
etcd3: true
memory_tracker: true
mysql: true
@@ -567,7 +567,7 @@
# Core services enabled for this branch.
# This list replaces the test-matrix.
# Shared services
- dstat: true
+ dstat: false
memory_tracker: true
tls-proxy: true
# Nova services
diff --git a/lib/cinder b/lib/cinder
index 76314c1..b029fa0 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -447,10 +447,6 @@
be_type=${be%%:*}
be_name=${be##*:}
if type init_cinder_backend_${be_type} >/dev/null 2>&1; then
- # Always init the default volume group for lvm.
- if [[ "$be_type" == "lvm" ]]; then
- init_default_lvm_volume_group
- fi
init_cinder_backend_${be_type} ${be_name}
fi
done
diff --git a/lib/database b/lib/database
index 7940cf2..78563f6 100644
--- a/lib/database
+++ b/lib/database
@@ -89,6 +89,10 @@
DATABASE_PASSWORD=$MYSQL_PASSWORD
fi
+ return 0
+}
+
+function define_database_baseurl {
# We configure Nova, Horizon, Glance and Keystone to use MySQL as their
# database server. While they share a single server, each has their own
# database and tables.
@@ -100,8 +104,6 @@
# NOTE: Don't specify ``/db`` in this string so we can use it for multiple services
BASE_SQL_CONN=${BASE_SQL_CONN:-$(get_database_type_$DATABASE_TYPE)://$DATABASE_USER:$DATABASE_PASSWORD@$DATABASE_HOST}
-
- return 0
}
# Recreate a given database
diff --git a/lib/nova b/lib/nova
index 1420183..5a12da6 100644
--- a/lib/nova
+++ b/lib/nova
@@ -233,6 +233,10 @@
stop_process "n-api-meta"
remove_uwsgi_config "$NOVA_UWSGI_CONF" "$NOVA_UWSGI"
remove_uwsgi_config "$NOVA_METADATA_UWSGI_CONF" "$NOVA_METADATA_UWSGI"
+
+ if [[ "$NOVA_BACKEND" == "LVM" ]]; then
+ clean_lvm_volume_group $DEFAULT_VOLUME_GROUP_NAME
+ fi
}
# configure_nova() - Set config files, create data dirs, etc
diff --git a/stack.sh b/stack.sh
index cb16fda..0659212 100755
--- a/stack.sh
+++ b/stack.sh
@@ -697,6 +697,8 @@
# Last chance for the database password. This must be handled here
# because read_password is not a library function.
read_password DATABASE_PASSWORD "ENTER A PASSWORD TO USE FOR THE DATABASE."
+
+ define_database_baseurl
else
echo "No database enabled"
fi
diff --git a/unstack.sh b/unstack.sh
index d9dca7c..4b57b6e 100755
--- a/unstack.sh
+++ b/unstack.sh
@@ -176,10 +176,6 @@
# enabled backends. So if Cinder is enabled, and installed successfully we are
# sure lvm2 (lvremove, /etc/lvm/lvm.conf, etc.) is here.
if is_service_enabled cinder && is_package_installed lvm2; then
- # Using /bin/true here indicates a BUG - maybe the
- # DEFAULT_VOLUME_GROUP_NAME doesn't exist? We should
- # isolate this further down in lib/cinder cleanup.
- clean_lvm_volume_group $DEFAULT_VOLUME_GROUP_NAME || /bin/true
clean_lvm_filter
fi