openstack
/
cinder
Code Issues Proposed changes

Merge "Declare multiattach is True in RBD driver"

This commit is contained in:
Jenkins 2015-11-24 20:03:09 +00:00 committed by Gerrit Code Review
parent 6b6863703a ee45352eee
commit 2c3b6e9912
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/tests/unit/test_rbd.py
View File

@ -721,7 +721,8 @@ class RBDTestCase(test.TestCase):
storage_protocol='ceph',
total_capacity_gb=27,
free_capacity_gb=26,
reserved_percentage=0)
reserved_percentage=0,
multiattach=True)
actual = self.driver.get_volume_stats(True)
client.cluster.mon_command.assert_called_once_with(
@ -746,7 +747,8 @@ class RBDTestCase(test.TestCase):
storage_protocol='ceph',
total_capacity_gb='unknown',
free_capacity_gb='unknown',
reserved_percentage=0)
reserved_percentage=0,
multiattach=True)
actual = self.driver.get_volume_stats(True)
client.cluster.mon_command.assert_called_once_with(

1
cinder/volume/drivers/rbd.py
View File

@ -383,6 +383,7 @@ class RBDDriver(driver.TransferVD, driver.ExtendVD,
'total_capacity_gb': 'unknown',
'free_capacity_gb': 'unknown',
'reserved_percentage': 0,
'multiattach': True,
}
backend_name = self.configuration.safe_get('volume_backend_name')
stats['volume_backend_name'] = backend_name or 'RBD'