openstack
/
manila
Code Issues Proposed changes

Make functions in manila uniquenamed 

Manila's devstack plugin has samenamed functions as in
cinder. It makes problems using cinder with manila's installation.
All function names should be unique.

Change-Id: I32fa7aecc7b74692b60c040cabd371f1499c21e6
Closes-Bug: #1290552
This commit is contained in:
vponomaryov 2014-03-10 23:08:52 +02:00
parent 6505530e47
commit 31f4a2e596
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/devstack/lib/manila
View File

@ -105,7 +105,7 @@ function _clean_share_group {
# _clean_share_group removes all manila shares from the specified shares group
_clean_share_group $SHARE_GROUP $SHARE_NAME_PREFIX
function _clean_lvm_backing_file {
function _clean_manila_lvm_backing_file {
local vg=$1
# if there is no logical volume left, it's safe to attempt a cleanup
@ -129,9 +129,7 @@ function cleanup_manila {
# Campsite rule: leave behind a share volume group at least as clean as we found it
# _clean_share_group $SHARE_GROUP $SHARE_NAME_PREFIX
_clean_share_group $SHARE_GROUP $SHARE_NAME_PREFIX
_clean_lvm_backing_file $SHARE_GROUP
_clean_manila_lvm_backing_file $SHARE_GROUP
}
# configure_manila - Set config files, create data dirs, etc