Update opensds ansible

This patch is designed for solving some problems below:
- Sync the latest code with opensds community
- Enable containerized deployment in ansible script
- Fix some bugs in port conflicts of etcd deployment

Change-Id: Id48906b91c08b3a98e6fc3d8d424a1cd2b11f2be
Signed-off-by: leonwang <wanghui71@huawei.com>

1 files changed, 27 insertions, 22 deletions

diff --git a/ci/ansible/roles/osdsdock/scenarios/lvm.yml b/ci/ansible/roles/osdsdock/scenarios/lvm.yml
index d1d7b36..5847aa3 100644..100755
--- a/ci/ansible/roles/osdsdock/scenarios/lvm.yml
+++ b/ci/ansible/roles/osdsdock/scenarios/lvm.yml
@@ -1,22 +1,27 @@
----

-- name: install lvm2 external package when lvm backend enabled

-  apt:

-    name: lvm2

-

-- 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

+---
+- 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