Merge "Infrastructure to use the DRBD transport for NOVA"

diff --cc etc/cinder/rootwrap.d/volume.filters
index 2b755d5db614350b09342631ad6b3fcffc394642,574cc3dc2abfd4cb53e49979f723881c0f721a9e..ceee5c87ae384920b0058649ac984f463d001c0b
--- 1/etc/cinder/rootwrap.d/volume.filters
--- 2/etc/cinder/rootwrap.d/volume.filters
+++ b/etc/cinder/rootwrap.d/volume.filters
@@@ -27,7 -27,11 +27,8 @@@ lvdisplay_lvmconf: EnvFilter, env, root
  # os-brick.filters file instead and clean out stale brick values from
  # this file.
  scsi_id: CommandFilter, /lib/udev/scsi_id, root
+ drbdadm: CommandFilter, drbdadm, root
  
 -# cinder/volumes/drivers/srb.py: 'pvresize', '--setphysicalvolumesize', sizestr, pvname
 -pvresize: CommandFilter, pvresize, root
 -
  # cinder/brick/local_dev/lvm.py: 'vgcreate', vg_name, pv_list
  vgcreate: CommandFilter, vgcreate, root