1. devstack
  2. Commit b066707d641696487fbd78773f191e2cfb4345f0
Browse code

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

Xinliang Liu authored on 2020/06/28 17:55:28
Showing 1 changed files
lib/cinder
History View file @ b066707
... ... 
@@ -419,7 +419,7 @@ function install_cinder {
419 419 
     if [[ "$CINDER_ISCSI_HELPER" == "tgtadm" ]]; then
420 420 
         install_package tgt
421 421 
     elif [[ "$CINDER_ISCSI_HELPER" == "lioadm" ]]; then
422 
-        if [[ ${DISTRO} == "bionic" ]]; then
422 
+        if is_ubuntu; then
423 423 
             # TODO(frickler): Workaround for https://launchpad.net/bugs/1819819
424 424 
             sudo mkdir -p /etc/target
425 425