Browse Source

Merge "[IBM DS8000]: Fix compatability issue in get_host"

changes/72/771572/5
Zuul 9 months ago
committed by Gerrit Code Review
parent
commit
69fab14cdb
  1. 4
      cinder/volume/drivers/ibm/ibm_storage/ds8k_helper.py
  2. 6
      releasenotes/notes/bug-1903648-ds8k-ostype-compatability-support-a86f608d8c014a29.yaml

4
cinder/volume/drivers/ibm/ibm_storage/ds8k_helper.py

@ -587,7 +587,7 @@ class DS8KCommonHelper(object):
def _get_host(self, connector):
# DS8K doesn't support hostname which is longer than 32 chars.
hname = ('OShost:%s' % filter_alnum(connector['host']))[:32]
hname = filter_alnum(connector['host'])[:32]
os_type = connector.get('os_type')
platform = connector.get('platform')
@ -597,7 +597,7 @@ class DS8KCommonHelper(object):
htype = 'iSeries'
elif os_type == 'AIX':
htype = 'pSeries'
elif platform in ('s390', 's390x') and os_type == 'linux2':
elif platform in ('s390', 's390x') and os_type in ('linux', 'linux2'):
htype = 'zLinux'
else:
htype = 'LinuxRHEL'

6
releasenotes/notes/bug-1903648-ds8k-ostype-compatability-support-a86f608d8c014a29.yaml

@ -0,0 +1,6 @@
---
fixes:
- |
IBM DS8000 Driver `Bug #1903648
<https://bugs.launchpad.net/cinder/+bug/1903648>`_:
Fix os_type compatability and hostname template issue.
Loading…
Cancel
Save