openstack
/
freezer
Code Issues Proposed changes

Fixing lvm snapshot mountpoint 

Lvm snapshot mountpoint should be in
/var/lib/freezer rather than /var/lib

Change-Id: Ice081f87c15405a9e6e7d88cb708c355d272d86a
This commit is contained in:
Pierre-Arthur MATHIEU 2016-10-03 14:01:17 +01:00 committed by Pierre Mathieu
parent 927fdab24e
commit e645c4cb29
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freezer/common/config.py
View File

@ -33,7 +33,7 @@ LOG = log.getLogger(__name__)
home = os.path.expanduser("~")
DEFAULT_LVM_SNAPSIZE = '1G'
DEFAULT_LVM_MOUNT_BASENAME = '/var/lib/freezer'
DEFAULT_LVM_MOUNT_BASEDIR = '/var/lib/freezer'
DEFAULT_LVM_SNAP_BASENAME = 'freezer_backup_snap'
DEFAULT_SSH_PORT = 22
@ -152,8 +152,8 @@ _COMMON = [
dest='lvm_dirmount',
default=DEFAULT_PARAMS['lvm_dirmount'],
help="Set the directory you want to mount the lvm snapshot to. "
"If not provided, a unique name will be generated with "
"thebasename {0} ".format(DEFAULT_LVM_MOUNT_BASENAME)),
"If not provided, a unique directory will be generated in "
"{0} ".format(DEFAULT_LVM_MOUNT_BASEDIR)),
cfg.StrOpt('lvm-volgroup',
dest='lvm_volgroup',
default=DEFAULT_PARAMS['lvm_volgroup'],

5
freezer/snapshot/lvm.py
View File

@ -109,9 +109,10 @@ def lvm_snap(backup_opt_dict):
backup_opt_dict.lvm_srcvol = lvm_info['srcvol']
if not backup_opt_dict.lvm_dirmount:
utils.create_dir(freezer_config.DEFAULT_LVM_MOUNT_BASEDIR)
backup_opt_dict.lvm_dirmount = \
"{0}_{1}".format(freezer_config.DEFAULT_LVM_MOUNT_BASENAME,
lvm_uuid)
"{0}/mount_{1}".format(freezer_config.DEFAULT_LVM_MOUNT_BASEDIR,
lvm_uuid)
backup_opt_dict.path_to_backup = os.path.join(backup_opt_dict.lvm_dirmount,
lvm_info['snap_path'])