Disable multi-attach for RBD

This is not really safe to turn on yet, as there
are RBD features which are incompatible with
multi-attach that must be managed from Cinder.

Disable multi-attach for now until code to handle
that is ready.

Change-Id: I17da2f4e897178762d1c3d1302d2d79ae28e349c
Related-Bug: #1519227
Partial-Bug: #1535815

diff --git a/cinder/tests/unit/test_rbd.py b/cinder/tests/unit/test_rbd.py
index a8025669cf02dd61e9b79ca9a455a6cace6d1d1c..c1f4a49041f8db7e7cd3df61f4246eccb333b195 100644 (file)
--- a/cinder/tests/unit/test_rbd.py
+++ b/cinder/tests/unit/test_rbd.py
@@ -773,7 +773,7 @@ class RBDTestCase(test.TestCase):
             total_capacity_gb=27,
             free_capacity_gb=26,
             reserved_percentage=0,
-            multiattach=True)
+            multiattach=False)
 
         actual = self.driver.get_volume_stats(True)
         client.cluster.mon_command.assert_called_once_with(
@@ -799,7 +799,7 @@ class RBDTestCase(test.TestCase):
                         total_capacity_gb='unknown',
                         free_capacity_gb='unknown',
                         reserved_percentage=0,
-                        multiattach=True)
+                        multiattach=False)
 
         actual = self.driver.get_volume_stats(True)
         client.cluster.mon_command.assert_called_once_with(

diff --git a/cinder/volume/drivers/rbd.py b/cinder/volume/drivers/rbd.py
index e80575bb82517e382da71287d17f7f95188893ee..91a02133e58d42c067a118348c79f6687ee2cd9f 100644 (file)
--- a/cinder/volume/drivers/rbd.py
+++ b/cinder/volume/drivers/rbd.py
@@ -388,7 +388,7 @@ class RBDDriver(driver.TransferVD, driver.ExtendVD,
             'total_capacity_gb': 'unknown',
             'free_capacity_gb': 'unknown',
             'reserved_percentage': 0,
-            'multiattach': True,
+            'multiattach': False,
         }
         backend_name = self.configuration.safe_get('volume_backend_name')
         stats['volume_backend_name'] = backend_name or 'RBD'