openstack/trove
Code Issues Proposed changes

Merge pull request #91 from rnirmal/vol_fix

Browse Source 
Adding config for device mapping
This commit is contained in:
Michael Basnight 2012-05-30 15:18:36 -07:00
commit 50eebfc229
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/reddwarf/reddwarf.conf.sample
View File

@ -46,6 +46,7 @@ add_addresses = True
# Config options for enabling volume service
reddwarf_volume_support = True
block_device_mapping = vdb
device_path = /dev/vdb
mount_point = /var/lib/mysql

12
reddwarf/instance/models.py
View File

@ -236,19 +236,15 @@ class Instance(object):
# <id>:[<type>]:[<size(GB)>]:[<delete_on_terminate>]
# setting the delete_on_terminate instance to true=1
mapping = "%s:%s:%s:%s" % (v_ref.id, '', v_ref.size, 1)
# TODO(rnirmal) This mapping device needs to be configurable.
# and we may have to do a little more trickery here.
# We don't know what's the next device available on the
# guest. Also in cases for ovz where this is mounted on
# the host, that's not going to work for us.
block_device = {'vdb': mapping}
bdm = CONFIG.get('block_device_mapping', 'vdb')
block_device = {bdm: mapping}
volumes = [{'id': v_ref.id,
'size': v_ref.size}]
LOG.debug("block_device = %s" % block_device)
LOG.debug("volume = %s" % volumes)
device_path = CONFIG.get('device_path')
mount_point = CONFIG.get('mount_point')
device_path = CONFIG.get('device_path', '/dev/vdb')
mount_point = CONFIG.get('mount_point', '/var/lib/mysql')
LOG.debug(_("device_path = %s") % device_path)
LOG.debug(_("mount_point = %s") % mount_point)
else: