openstack
/
cinder
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2021-03-17 00:52:43 +00:00 committed by Gerrit Code Review
parent d72bdf17e4 d729522acb
commit 69fab14cdb
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -587,7 +587,7 @@ class DS8KCommonHelper(object):
def _get_host(self, connector): def _get_host(self, connector):
# DS8K doesn't support hostname which is longer than 32 chars. # 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') os_type = connector.get('os_type')
platform = connector.get('platform') platform = connector.get('platform')
@ -597,7 +597,7 @@ class DS8KCommonHelper(object):
htype = 'iSeries' htype = 'iSeries'
elif os_type == 'AIX': elif os_type == 'AIX':
htype = 'pSeries' htype = 'pSeries'
elif platform in ('s390', 's390x') and os_type == 'linux2': elif platform in ('s390', 's390x') and os_type in ('linux', 'linux2'):
htype = 'zLinux' htype = 'zLinux'
else: else:
htype = 'LinuxRHEL' htype = 'LinuxRHEL'

6
releasenotes/notes/bug-1903648-ds8k-ostype-compatability-support-a86f608d8c014a29.yaml Normal file
View File

@ -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.