openstack
/
charm-hacluster
Code Issues Proposed changes

Use rbd OCF from Quantal instead of Raring.

This commit is contained in:
Adam Gandelman 2013-02-27 17:37:10 -08:00
parent 6c3c431e35
commit d9ceb58093
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ocf/ceph/rbd
View File

@ -134,7 +134,7 @@ find_rbd_dev() {
# Build the sed pattern, substituting "-" for the snapshot name if
# it's unset
sedpat="[0-9]\+[ \t]\+${OCF_RESKEY_pool}[ \t]\+${OCF_RESKEY_name}[ \t]\+${OCF_RESKEY_snap:--}[ \t]\+\(/dev/rbd[0-9]\+\)"
sedpat="[0-9]\+\t${OCF_RESKEY_pool}\t${OCF_RESKEY_name}\t${OCF_RESKEY_snap:--}\t\(/dev/rbd[0-9]\+\)"
# Run rbd showmapped, filter out the header line, then try to
# extract the device name
@ -200,10 +200,10 @@ rbd_start() {
fi
if [ -n "${OCF_RESKEY_user}" ]; then
rbd_map_options="--id ${OCF_RESKEY_user}"
rbd_map_options="--user ${OCF_RESKEY_user}"
fi
if [ -n "${OCF_RESKEY_secret}" ]; then
rbd_map_options="$rbd_map_options --keyfile ${OCF_RESKEY_secret}"
rbd_map_options="$rbd_map_options --secret ${OCF_RESKEY_secret}"
fi
rbd_name="${OCF_RESKEY_pool}/${OCF_RESKEY_name}"

2
revision
View File

@ -1 +1 @@
64
65