Merge pull request #331 from joseph-v/FixVGClean

Fixes cleanup of lvm loop devices

ansible/roles/cleaner/scenarios/backend.yml

@@ -219,7 +219,7 @@
           # if there is no logical volume left, it's safe to attempt a cleanup
           # of the backing file
           if [[ -z "$(sudo lvs --noheadings -o lv_name $vg 2>/dev/null)" ]]; then
-              _clean_lvm_backing_file {{ cinder_data_dir }}/${vg}.img
+              _clean_lvm_backing_file {{ hotpot_work_dir }}/volumegroups/${vg}.img
           fi
       }
 

ansible/roles/cleaner/tasks/main.yml

@@ -98,6 +98,28 @@
   when: sushi_plugin_type == "csi"
   tags: sushi
 
+- name: include scenarios/auth-keystone.yml when keystone specified
+  include_tasks: scenarios/auth-keystone.yml
+  when: opensds_auth_strategy == "keystone"
+  tags: keystone
+
+- name: include scenarios/repository.yml if installed from repository
+  include_tasks: scenarios/repository.yml
+  when: install_from == "repository"
+
+- name: include scenarios/release.yml if installed from release
+  include_tasks: scenarios/release.yml
+  when: install_from == "release"
+
+- name: include scenarios/backend.yml for cleaning up storage backend service
+  include_tasks: scenarios/backend.yml
+  tags: dock
+
+- name: include scenarios/orchestration.yml for cleaning up orchestration service
+  include_tasks: scenarios/orchestration.yml
+  when: enable_orchestration == true
+  tags: orchestration
+
 - name: clean all configuration and log files
   file:
     path: "{{ item }}"
@@ -122,25 +144,3 @@
   ignore_errors: yes
   when: source_purge is undefined or source_purge != false
   tags: clean
-
-- name: include scenarios/auth-keystone.yml when keystone specified
-  include_tasks: scenarios/auth-keystone.yml
-  when: opensds_auth_strategy == "keystone"
-  tags: keystone
-
-- name: include scenarios/repository.yml if installed from repository
-  include_tasks: scenarios/repository.yml
-  when: install_from == "repository"
-
-- name: include scenarios/release.yml if installed from release
-  include_tasks: scenarios/release.yml
-  when: install_from == "release"
-
-- name: include scenarios/backend.yml for cleaning up storage backend service
-  include_tasks: scenarios/backend.yml
-  tags: dock
-
-- name: include scenarios/orchestration.yml for cleaning up orchestration service
-  include_tasks: scenarios/orchestration.yml
-  when: enable_orchestration == true
-  tags: orchestration