openstack/devstack
Code Issues Proposed changes

cinder: Default CINDER_ISCSI_HELPER to tgtadm on Bionic

Browse Source 
If5c860d1e69aaef9a9236303c370479a7714ad43 attempted to move this default
to lioadm while pinning certain Bionic based jobs to tgtadm.

Unfortunately it missed the legacy dsvm based jobs within various
projects that do not inherit from the devstack-platform-bionic base job
and that are also not covered by devstack's gate.

This change simply forces CINDER_ISCSI_HELPER to tgtadm on Bionic based
hosts to ensure it is always used.

Closes-Bug: #1926411
Change-Id: Ib4b38b45f25575c92fb09b8e97fa1b24af0cc06a
This commit is contained in:
Lee Yarwood 2021-04-28 09:26:23 +01:00
parent c062792709
commit 0386c1cda6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/cinder
View File

@ -91,8 +91,13 @@ CINDER_VOLUME_CLEAR=$(echo ${CINDER_VOLUME_CLEAR} | tr '[:upper:]' '[:lower:]')
# Default to lioadm # Default to lioadm
CINDER_ISCSI_HELPER=${CINDER_ISCSI_HELPER:-lioadm} CINDER_ISCSI_HELPER=${CINDER_ISCSI_HELPER:-lioadm}
# EL and SUSE should only use lioadm, we continue to allow Ubuntu based # Bionic needs to default to tgtadm until support is dropped within devstack
# deployments to use tgtadm for specific jobs in the cinder-tempest-plugin # as the rtslib-fb-targetctl service doesn't start after installing lioadm.
if is_ubuntu && [[ "$DISTRO" == "bionic" ]]; then
CINDER_ISCSI_HELPER=tgtadm
fi
# EL and SUSE should only use lioadm
if is_fedora || is_suse; then if is_fedora || is_suse; then
if [[ ${CINDER_ISCSI_HELPER} != "lioadm" ]]; then if [[ ${CINDER_ISCSI_HELPER} != "lioadm" ]]; then
die "lioadm is the only valid Cinder target_helper config on this platform" die "lioadm is the only valid Cinder target_helper config on this platform"