Merge branch 'master' into next

[ganeti-local] / lib / backend.py

diff --git a/lib/backend.py b/lib/backend.py
index 68dcf7f..b08c937 100644 (file)
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -2392,7 +2392,7 @@ def DrbdAttachNet(nodes_ip, disks, instance_name, multimaster):
         # standalone, even though this should not happen with the
         # new staged way of changing disk configs
         try:
-          rd.ReAttachNet(multimaster)
+          rd.AttachNet(multimaster)
         except errors.BlockDeviceError, err:
           return (False, "Can't change network configuration: %s" % str(err))
     if all_connected: