Merge nbp installation into opensds ansible script

[stor4nfv.git] / ci / ansible / roles / osdsdock / scenarios / lvm.yml

diff --git a/ci/ansible/roles/osdsdock/scenarios/lvm.yml b/ci/ansible/roles/osdsdock/scenarios/lvm.yml
index d1d7b36..743fe3b 100644 (file)
--- a/ci/ansible/roles/osdsdock/scenarios/lvm.yml
+++ b/ci/ansible/roles/osdsdock/scenarios/lvm.yml
@@ -3,20 +3,18 @@
   apt:\r
     name: lvm2\r
 \r
-- name: check if physical volume existed\r
-  shell: pvdisplay {{ pv_device }}\r
-  ignore_errors: yes\r
-  register: pv_existed\r
-\r
-- name: create a physical volume\r
-  shell: pvcreate {{ pv_device }}\r
-  when: pv_existed is undefined or pv_existed.rc != 0\r
+- name: copy opensds lvm backend file if specify lvm backend\r
+  copy:\r
+    src: ../../../group_vars/lvm/lvm.yaml\r
+    dest: "{{ lvm_config_path }}"\r
 \r
 - name: check if volume group existed\r
   shell: vgdisplay {{ vg_name }}\r
   ignore_errors: yes\r
   register: vg_existed\r
 \r
-- name: create a volume group\r
-  shell: vgcreate {{ vg_name }} {{ pv_device }}\r
+- name: create a volume group and initialize it\r
+  lvg:\r
+    vg: "{{ vg_name }}"\r
+    pvs: "{{ pv_devices }}"\r
   when: vg_existed is undefined or vg_existed.rc != 0\r