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
old mode 100755 (executable)
new mode 100644 (file)
index 5847aa3..743fe3b
--- a/ci/ansible/roles/osdsdock/scenarios/lvm.yml
+++ b/ci/ansible/roles/osdsdock/scenarios/lvm.yml
@@ -1,27 +1,20 @@
----
-- name: install lvm2 external package when lvm backend enabled
-  apt:
-    name: lvm2
-
-- name: copy opensds lvm backend file if specify lvm backend
-  copy:
-    src: ../../../group_vars/lvm/lvm.yaml
-    dest: "{{ lvm_config_path }}"
-
-- name: check if physical volume existed
-  shell: pvdisplay {{ pv_device }}
-  ignore_errors: yes
-  register: pv_existed
-
-- name: create a physical volume
-  shell: pvcreate {{ pv_device }}
-  when: pv_existed is undefined or pv_existed.rc != 0
-
-- name: check if volume group existed
-  shell: vgdisplay {{ vg_name }}
-  ignore_errors: yes
-  register: vg_existed
-
-- name: create a volume group
-  shell: vgcreate {{ vg_name }} {{ pv_device }}
-  when: vg_existed is undefined or vg_existed.rc != 0
+---\r
+- name: install lvm2 external package when lvm backend enabled\r
+  apt:\r
+    name: lvm2\r
+\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 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