openstack/devstack
Code Issues Proposed changes

Merge "init_cinder() shouldn't always create DEFAULT_VOLUME_GROUP_NAME"

Browse Source
This commit is contained in:
Zuul 2022-01-04 18:50:10 +00:00 committed by Gerrit Code Review
commit 0486d4ccf3
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/cinder
View File

@ -447,10 +447,6 @@ function init_cinder {
be_type=${be%%:*} be_type=${be%%:*}
be_name=${be##*:} be_name=${be##*:}
if type init_cinder_backend_${be_type} >/dev/null 2>&1; then 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} init_cinder_backend_${be_type} ${be_name}
fi fi
done done

4
lib/nova
View File

@ -233,6 +233,10 @@ function cleanup_nova {
stop_process "n-api-meta" stop_process "n-api-meta"
remove_uwsgi_config "$NOVA_UWSGI_CONF" "$NOVA_UWSGI" remove_uwsgi_config "$NOVA_UWSGI_CONF" "$NOVA_UWSGI"
remove_uwsgi_config "$NOVA_METADATA_UWSGI_CONF" "$NOVA_METADATA_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 # configure_nova() - Set config files, create data dirs, etc

4
unstack.sh
View File

@ -176,10 +176,6 @@ fi
# enabled backends. So if Cinder is enabled, and installed successfully we are # enabled backends. So if Cinder is enabled, and installed successfully we are
# sure lvm2 (lvremove, /etc/lvm/lvm.conf, etc.) is here. # sure lvm2 (lvremove, /etc/lvm/lvm.conf, etc.) is here.
if is_service_enabled cinder && is_package_installed lvm2; then 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 clean_lvm_filter
fi fi