Merge "DRBD: Define a separate prefix for snapshots"

diff --cc cinder/volume/drivers/drbdmanagedrv.py
index d2790f52c05ed060c4b0c3036a37ef74e1943244,ea0b9b8662d45729e8913b82ab563e1a9a0201d1..306ce9297abc2bb5c941f7aa197fe8b62c24691d
--- 1/cinder/volume/drivers/drbdmanagedrv.py
--- 2/cinder/volume/drivers/drbdmanagedrv.py
+++ b/cinder/volume/drivers/drbdmanagedrv.py
@@@ -63,8 -63,9 +63,9 @@@ CONF = cfg.CON
  CONF.register_opts(drbd_opts)
  
  
 -CINDER_AUX_PROP_id = "cinder-id"
 +AUX_PROP_CINDER_VOL_ID = "cinder-id"
  DM_VN_PREFIX = 'CV_'  # sadly 2CV isn't allowed by DRBDmanage
+ DM_SN_PREFIX = 'SN_'
  
  
  class DrbdManageDriver(driver.VolumeDriver):