openstack/devstack
Code Issues Proposed changes

Fix targetcli install error on ubuntu focal

Browse Source 
No targetcli package on Ubuntu Focal, it should use targetcli-fb also
when "$CINDER_ISCSI_HELPER" == "lioadm".

Although Xenial only has targetcli, but Xenial is dropped from CI. And
starting from bionic, Ubuntu uses targetcli-fb to replace targetcli. So
here we can use is_ubuntu to make ubuntu use targetcli-fb.

Change-Id: I6d35b6651d486e716980dcd9f4d693bed560463a
This commit is contained in:
Xinliang Liu 2020-06-28 08:55:28 +00:00
parent 46e74f339d
commit b066707d64
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cinder
View File

@ -419,7 +419,7 @@ function install_cinder {
if [[ "$CINDER_ISCSI_HELPER" == "tgtadm" ]]; then if [[ "$CINDER_ISCSI_HELPER" == "tgtadm" ]]; then
install_package tgt install_package tgt
elif [[ "$CINDER_ISCSI_HELPER" == "lioadm" ]]; then elif [[ "$CINDER_ISCSI_HELPER" == "lioadm" ]]; then
if [[ ${DISTRO} == "bionic" ]]; then if is_ubuntu; then
# TODO(frickler): Workaround for https://launchpad.net/bugs/1819819 # TODO(frickler): Workaround for https://launchpad.net/bugs/1819819
sudo mkdir -p /etc/target sudo mkdir -p /etc/target