Browse Source

Merge "New fix for rbd connector to work with ceph octopus" into stable/train

stable/train
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
55dd987319
  1. 7
      os_brick/initiator/connectors/rbd.py
  2. 4
      os_brick/tests/initiator/connectors/test_rbd.py
  3. 12
      releasenotes/notes/bug-1865754-ceph-octopus-compatibility-0aa9b8bc1b028301.yaml

7
os_brick/initiator/connectors/rbd.py

@ -97,7 +97,12 @@ class RBDConnector(base.BaseLinuxConnector):
try:
fd, ceph_conf_path = tempfile.mkstemp(prefix="brickrbd_")
with os.fdopen(fd, 'w') as conf_file:
conf_file.writelines([mon_hosts, "\n", keyring, "\n"])
# Bug #1865754 - '[global]' has been the appropriate
# place for this stuff since at least Hammer, but in
# Octopus (15.2.0+), Ceph began enforcing this.
conf_file.writelines(["[global]", "\n",
mon_hosts, "\n",
keyring, "\n"])
return ceph_conf_path
except IOError:
msg = (_("Failed to write data to %s.") % (ceph_conf_path))

4
os_brick/tests/initiator/connectors/test_rbd.py

@ -171,6 +171,10 @@ class RBDConnectorTestCase(test_connector.ConnectorTestCase):
self.keyring)
self.assertEqual(conf_path, tmpfile)
mock_mkstemp.assert_called_once_with(prefix='brickrbd_')
# Bug #1865754 - make sure generated config file has a '[global]'
# section
_, args, _ = mockopen().writelines.mock_calls[0]
self.assertIn('[global]', args[0])
@mock.patch.object(priv_rootwrap, 'execute', return_value=None)
def test_connect_local_volume(self, mock_execute):

12
releasenotes/notes/bug-1865754-ceph-octopus-compatibility-0aa9b8bc1b028301.yaml

@ -0,0 +1,12 @@
---
fixes:
- |
`Bug #1865754 <https://bugs.launchpad.net/cinder/+bug/1865754>`_:
the ``RBDConnector`` class generates a temporary configuration file
to connect to Ceph. Previously, os-brick did not include a
``[global]`` section to contain the options it sets, but with the
Octopus release (15.2.0+), Ceph has begun enforcing the presence
of this section marker, which dates back at least to the Hammer
release of Ceph. With this release, os-brick includes the
``[global]`` section in the generated configuration file, which
should be backward-compatible at least to Ceph Hammer.
Loading…
Cancel
Save