From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 16 Jan 2016 12:23:58 +0000 (+0000)
Subject: Merge "Infrastructure to use the DRBD transport for NOVA"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a329fd9c29a29638e5019970f70601bdfa95d029;p=openstack-build%2Fcinder-build.git

Merge "Infrastructure to use the DRBD transport for NOVA"
---

a329fd9c29a29638e5019970f70601bdfa95d029
diff --cc etc/cinder/rootwrap.d/volume.filters
index 2b755d5db,574cc3dc2..ceee5c87a
--- a/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