openstack/devstack
Code Issues Proposed changes

Merge "Additional options for XenAPINFS cinder driver"

Browse Source
This commit is contained in:
Jenkins 2012-11-30 20:27:50 +00:00 committed by Gerrit Code Review
commit 653ed37440
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/cinder
View File

@ -24,6 +24,9 @@ set +o xtrace
# Defaults # Defaults
# -------- # --------
# set up default driver
CINDER_DRIVER=${CINDER_DRIVER:-default}
# set up default directories # set up default directories
CINDER_DIR=$DEST/cinder CINDER_DIR=$DEST/cinder
CINDERCLIENT_DIR=$DEST/python-cinderclient CINDERCLIENT_DIR=$DEST/python-cinderclient
@ -145,6 +148,19 @@ function configure_cinder() {
iniset $CINDER_CONF DEFAULT logging_debug_format_suffix "from (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d" iniset $CINDER_CONF DEFAULT logging_debug_format_suffix "from (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d"
iniset $CINDER_CONF DEFAULT logging_exception_prefix "%(color)s%(asctime)s TRACE %(name)s %(instance)s" iniset $CINDER_CONF DEFAULT logging_exception_prefix "%(color)s%(asctime)s TRACE %(name)s %(instance)s"
fi fi
if [ "$CINDER_DRIVER" == "XenAPINFS" ]; then
(
set -u
iniset $CINDER_CONF DEFAULT volume_driver "cinder.volume.xenapi_sm.XenAPINFSDriver"
iniset $CINDER_CONF DEFAULT xenapi_connection_url "$CINDER_XENAPI_CONNECTION_URL"
iniset $CINDER_CONF DEFAULT xenapi_connection_username "$CINDER_XENAPI_CONNECTION_USERNAME"
iniset $CINDER_CONF DEFAULT xenapi_connection_password "$CINDER_XENAPI_CONNECTION_PASSWORD"
iniset $CINDER_CONF DEFAULT xenapi_nfs_server "$CINDER_XENAPI_NFS_SERVER"
iniset $CINDER_CONF DEFAULT xenapi_nfs_serverpath "$CINDER_XENAPI_NFS_SERVERPATH"
)
[ $? -ne 0 ] && exit 1
fi
} }
# init_cinder() - Initialize database and volume group # init_cinder() - Initialize database and volume group