Merge "Auto add a cinder lvm.conf file"
This commit is contained in:
commit
c2999d190a
17
lib/cinder
17
lib/cinder
@ -395,15 +395,32 @@ function init_cinder {
|
||||
|
||||
if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then
|
||||
local be be_name be_type
|
||||
local has_lvm=0
|
||||
for be in ${CINDER_ENABLED_BACKENDS//,/ }; do
|
||||
be_type=${be%%:*}
|
||||
be_name=${be##*:}
|
||||
|
||||
if [[ $be_type == 'lvm' ]]; then
|
||||
has_lvm=1
|
||||
fi
|
||||
|
||||
if type init_cinder_backend_${be_type} >/dev/null 2>&1; then
|
||||
init_cinder_backend_${be_type} ${be_name}
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# Keep it simple, set a marker if there's an LVM backend
|
||||
# use the created VG's to setup lvm filters
|
||||
if [[ $has_lvm == 1 ]]; then
|
||||
# Order matters here, not only obviously to make
|
||||
# sure the VG's are created, but also some distros
|
||||
# do some customizations to lvm.conf on init, we
|
||||
# want to make sure we copy those over
|
||||
sudo cp /etc/lvm/lvm.conf /etc/cinder/lvm.conf
|
||||
configure_cinder_backend_conf_lvm
|
||||
fi
|
||||
|
||||
mkdir -p $CINDER_STATE_PATH/volumes
|
||||
create_cinder_cache_dir
|
||||
}
|
||||
|
@ -19,6 +19,7 @@
|
||||
# clean_cinder_backend_lvm - called from clean_cinder()
|
||||
# configure_cinder_backend_lvm - called from configure_cinder()
|
||||
# init_cinder_backend_lvm - called from init_cinder()
|
||||
# configure_cinder_backend_conf_lvm - called from configure_cinder()
|
||||
|
||||
|
||||
# Save trace setting
|
||||
@ -64,6 +65,35 @@ function init_cinder_backend_lvm {
|
||||
init_lvm_volume_group $VOLUME_GROUP_NAME-$be_name $VOLUME_BACKING_FILE_SIZE
|
||||
}
|
||||
|
||||
# configure_cinder_backend_conf_lvm - Sets device filter in /etc/cinder/lvm.conf
|
||||
# init_cinder_backend_lvm
|
||||
function configure_cinder_backend_conf_lvm {
|
||||
local filter_suffix='"r/.*/" ]'
|
||||
local filter_string="filter = [ "
|
||||
local conf_entries=$(grep volume_group /etc/cinder/cinder.conf | sed "s/ //g")
|
||||
local pv
|
||||
local vg
|
||||
local line
|
||||
|
||||
for pv_info in $(sudo pvs --noheadings -o name,vg_name --separator ';'); do
|
||||
IFS=';' read pv vg <<< $pv_info
|
||||
for line in ${conf_entries}; do
|
||||
IFS='=' read label group <<< $line
|
||||
group=$(echo $group|sed "s/^ *//g")
|
||||
if [[ "$vg" == "$group" ]]; then
|
||||
new="\"a$pv/\", "
|
||||
filter_string=$filter_string$new
|
||||
fi
|
||||
done
|
||||
done
|
||||
filter_string=$filter_string$filter_suffix
|
||||
|
||||
# FIXME(jdg): Possible odd case that the lvm.conf file has been modified
|
||||
# and doesn't have a filter entry to search/replace. For devstack don't
|
||||
# know that we care, but could consider adding a check and add
|
||||
sudo sed -i "s#^[ \t]*filter.*# $filter_string#g" /etc/cinder/lvm.conf
|
||||
echo "set LVM filter_strings: $filter_string"
|
||||
}
|
||||
# Restore xtrace
|
||||
$MY_XTRACE
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user