Don't pass sstore to LUs anymore

[ganeti-local] / lib / bdev.py

diff --git a/lib/bdev.py b/lib/bdev.py
index 3648a2c..2d16666 100644 (file)
--- a/lib/bdev.py
+++ b/lib/bdev.py
@@ -1253,7 +1253,10 @@ class DRBD8(BaseDRBD):
         res_r = self._AssembleNet(minor,
                                   (self._lhost, self._lport,
                                    self._rhost, self._rport),
-                                  "C")
+                                  constants.DRBD_NET_PROTOCOL,
+                                  hmac=constants.DRBD_HMAC_ALG,
+                                  secret=self._secret
+                                  )
         if res_r:
           if self._MatchesNet(self._GetDevInfo(self._GetShowData(minor))):
             break
@@ -1281,7 +1284,10 @@ class DRBD8(BaseDRBD):
         # local storage (i.e. one or more of the _[lr](host|port) is
         # None)
         if (self._AssembleNet(minor, (self._lhost, self._lport,
-                                      self._rhost, self._rport), "C") and
+                                      self._rhost, self._rport),
+                              constants.DRBD_NET_PROTOCOL,
+                              hmac=constants.DRBD_HMAC_ALG,
+                              secret=self._secret) and
             self._MatchesNet(self._GetDevInfo(self._GetShowData(minor)))):
           break
 
@@ -1333,7 +1339,9 @@ class DRBD8(BaseDRBD):
       result = self._AssembleNet(minor,
                                  (self._lhost, self._lport,
                                   self._rhost, self._rport),
-                                 "C")
+                                 constants.DRBD_NET_PROTOCOL,
+                                 hmac=constants.DRBD_HMAC_ALG,
+                                 secret=self._secret)
       if not result:
         if need_localdev_teardown:
           # we will ignore failures from this