openstack/os-brick
Code Issues Proposed changes

Update the OSSN-0085 note

Browse Source 
Update existing node in the RBD connector about the removal of the
keyring data in the connection info to note that the code should not be
removed, since it is used by cinderlib.

Related-Bug: #738216
Change-Id: I1f76045b677833bb155978e1a166e63d53dc2aba
This commit is contained in:
Gorka Eguileor 2020-09-17 13:37:59 +02:00
parent 8192331a24
commit 18fc838ea3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
os_brick/initiator/connectors/rbd.py
View File

@ -121,7 +121,8 @@ class RBDConnector(base.BaseLinuxConnector):
monitor_ips = connection_properties['hosts']
monitor_ports = connection_properties['ports']
# NOTE: cinder no longer passes keyring data in the connection
# properties as of the victoria release. See OSSN-0085.
# properties as of the victoria release. See OSSN-0085. But
# cinderlib does, so we must keep the code related to the keyring.
keyring = connection_properties.get('keyring')
except (KeyError, ValueError):
msg = _("Connect volume failed, malformed connection properties.")