commit b066707d641696487fbd78773f191e2cfb4345f0
author Xinliang Liu <xinliang.liu@linaro.org> Sun Jun 28 08:55:28 2020 +0000
committer Xinliang Liu <xinliang.liu@linaro.org> Sun Jun 28 09:59:02 2020 +0000
tree f09c46340f6864b7fcd48ab2984e8ab78d5db946
parent 46e74f339d2b1d9ab6969127923503a04d88aff3

Fix targetcli install error on ubuntu focal

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

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index c2e55f9..b1e3d0d 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -419,7 +419,7 @@
     if [[ "$CINDER_ISCSI_HELPER" == "tgtadm" ]]; then
         install_package tgt
     elif [[ "$CINDER_ISCSI_HELPER" == "lioadm" ]]; then
-        if [[ ${DISTRO} == "bionic" ]]; then
+        if is_ubuntu; then
             # TODO(frickler): Workaround for https://launchpad.net/bugs/1819819
             sudo mkdir -p /etc/target