From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 23 Jul 2015 03:12:18 +0000 (+0000)
Subject: Merge "DRBD: Define a separate prefix for snapshots"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=287d2d2965ed98c4aa0acdc47388788157079333;p=openstack-build%2Fcinder-build.git

Merge "DRBD: Define a separate prefix for snapshots"
---

287d2d2965ed98c4aa0acdc47388788157079333
diff --cc cinder/volume/drivers/drbdmanagedrv.py
index d2790f52c,ea0b9b866..306ce9297
--- a/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):