summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2018-03-23 11:35:20 -0700
committerRoss Brattain <ross.b.brattain@intel.com>2018-03-23 14:42:24 -0700
commitb8639e24f6c05727c858413118ac523a29dc1b67 (patch)
treee3b93203eb28a022abd20cd5b0bc22d2dc73492f
parent4b60891a8b0a23d785053b7d99a973b4e83e0a1e (diff)
use basename to delete yardstick image loop devices
the full path probably isn't matching, so just grep for the basename JIRA: YARDSTICK-1096 JIRA: YARDSTICK-1054 Change-Id: I403a7f51310c0856fae0f79d115ba0786b7c417c Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
-rw-r--r--ansible/build_yardstick_image.yml18
1 files changed, 9 insertions, 9 deletions
diff --git a/ansible/build_yardstick_image.yml b/ansible/build_yardstick_image.yml
index 4ad6e97a9..429ab88aa 100644
--- a/ansible/build_yardstick_image.yml
+++ b/ansible/build_yardstick_image.yml
@@ -74,11 +74,19 @@
command: kpartx -dv "{{ raw_imgfile }}"
ignore_errors: true
+ - name: Debug dump loop devices
+ command: losetup
+ register: losetup_output
+
+ - debug:
+ var: losetup_output
+ verbosity: 2
+
- name: delete loop devices for image file
# use this because kpartx -dv will fail if raw_imgfile was delete
# but in theory we could have deleted file still attached to loopback device?
# use grep because of // and awk
- shell: losetup -O NAME,BACK-FILE | grep "{{ raw_imgfile }}" | awk '{ print $1 }' | xargs -l1 losetup -d
+ shell: losetup -O NAME,BACK-FILE | grep "{{ raw_imgfile_basename }}" | awk '{ print $1 }' | xargs -l1 losetup -d
ignore_errors: true
- name: delete {{ raw_imgfile }}
@@ -121,14 +129,6 @@
with_sequence: start=0 end=9
tags: mknod_devices
- - name: Debug dump loop devices
- command: losetup
- register: losetup_output
-
- - debug:
- var: losetup_output
- verbosity: 2
-
- name: find first partition device
command: kpartx -l "{{ raw_imgfile }}"
register: kpartx_res