Merge "run tgt-admin --delete only if input not empty"

Jenkins · openstack-gerrit · commit 06be15aebb94 · 2016-03-31T23:12:26.000Z
diff --git a/lib/lvm b/lib/lvm
@@ -124,7 +124,7 @@ function init_lvm_volume_group {
     if [ "$CINDER_ISCSI_HELPER" = "lioadm" ]; then
         sudo cinder-rtstool get-targets | sudo xargs -rn 1 cinder-rtstool delete
     else
-        sudo tgtadm --op show --mode target | grep Target | cut -f3 -d ' ' | sudo xargs -n1 tgt-admin --delete || true
+        sudo tgtadm --op show --mode target | awk '/Target/ {print $3}' | sudo xargs -r -n1 tgt-admin --delete
     fi
     _clean_lvm_volume_group $vg
 }

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ function init_lvm_volume_group {`
`124`	`124`	`if [ "$CINDER_ISCSI_HELPER" = "lioadm" ]; then`
`125`	`125`	`sudo cinder-rtstool get-targets \| sudo xargs -rn 1 cinder-rtstool delete`
`126`	`126`	`else`
`127`		`- sudo tgtadm --op show --mode target \| grep Target \| cut -f3 -d ' ' \| sudo xargs -n1 tgt-admin --delete \|\| true`
	`127`	`+ sudo tgtadm --op show --mode target \| awk '/Target/ {print $3}' \| sudo xargs -r -n1 tgt-admin --delete`
`128`	`128`	`fi`
`129`	`129`	`_clean_lvm_volume_group $vg`
`130`	`130`	`}`