Merge "Disable multi-attach for RBD"

2016-02-29 02:42:19 +00:00 · 2016-02-29 02:42:19 +00:00 · 9c28691578
commit 9c28691578
parent 62a65629ce 59a22e3d3e
2 changed files with 3 additions and 3 deletions
--- 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(
--- 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'