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>

3 files changed, 57 insertions, 42 deletions

diff --git a/ci/ansible/roles/osdsdb/scenarios/container.yml b/ci/ansible/roles/osdsdb/scenarios/container.yml
new file mode 100644
index 0000000..8a75ef2
--- /dev/null
+++ b/ci/ansible/roles/osdsdb/scenarios/container.yml
@@ -0,0 +1,10 @@
+---
+- name: run etcd containerized service
+  docker:
+    name: myetcd
+    image: quay.io/coreos/etcd:latest
+    command: /usr/local/bin/etcd --advertise-client-urls http://{{ etcd_host }}:{{ etcd_port }} --listen-client-urls http://{{ etcd_host }}:{{ etcd_port }} -advertise-client-urls http://{{ etcd_host }}:{{ etcd_peer_port }} -listen-peer-urls http://{{ etcd_host }}:{{ etcd_peer_port }}
+    state: started
+    net: host
+    volumes:
+    - "/usr/share/ca-certificates/:/etc/ssl/certs"
diff --git a/ci/ansible/roles/osdsdb/scenarios/etcd.yml b/ci/ansible/roles/osdsdb/scenarios/etcd.yml
index 86f3a67..b05f0e7 100644..100755
--- a/ci/ansible/roles/osdsdb/scenarios/etcd.yml
+++ b/ci/ansible/roles/osdsdb/scenarios/etcd.yml
@@ -1,38 +1,39 @@
----

-- name: check for etcd existed

-  stat:

-    path: "{{ etcd_dir }}/etcd"

-  ignore_errors: yes

-  register: etcdexisted

-

-- name: download etcd

-  get_url:

-    url={{ etcd_download_url }}

-    dest=/opt/{{ etcd_tarball }}

-  when:

-    - etcdexisted.stat.exists is undefined or etcdexisted.stat.exists == false

-

-- name: extract the etcd tarball

-  unarchive:

-    src=/opt/{{ etcd_tarball }}

-    dest=/opt/

-  when:

-    - etcdexisted.stat.exists is undefined or etcdexisted.stat.exists == false

-

-- name: Check if etcd is running

-  shell: ps aux | grep etcd | grep -v grep

-  ignore_errors: true

-  register: service_etcd_status

-

-- name: run etcd daemon service

-  shell: nohup ./etcd &>>etcd.log &

-  become: true

-  args:

-    chdir: "{{ etcd_dir }}"

-  when: service_etcd_status.rc != 0

-

-- name: check etcd cluster health

-  shell: ./etcdctl cluster-health

-  become: true

-  args:

-    chdir: "{{ etcd_dir }}"

+---
+- name: check for etcd existed
+  stat:
+    path: "{{ etcd_dir }}/etcd"
+  ignore_errors: yes
+  register: etcdexisted
+
+- name: download etcd
+  get_url:
+    url={{ etcd_download_url }}
+    dest=/opt/{{ etcd_tarball }}
+  when:
+    - etcdexisted.stat.exists is undefined or etcdexisted.stat.exists == false
+
+- name: extract the etcd tarball
+  unarchive:
+    src=/opt/{{ etcd_tarball }}
+    dest=/opt/
+  when:
+    - etcdexisted.stat.exists is undefined or etcdexisted.stat.exists == false
+
+- name: Check if etcd is running
+  shell: ps aux | grep etcd | grep -v grep
+  ignore_errors: true
+  register: service_etcd_status
+
+- name: run etcd daemon service
+  shell: nohup ./etcd --advertise-client-urls http://{{ etcd_host }}:{{ etcd_port }} --listen-client-urls http://{{ etcd_host }}:{{ etcd_port }} -advertise-client-urls http://{{ etcd_host }}:{{ etcd_peer_port }} -listen-peer-urls http://{{ etcd_host }}:{{ etcd_peer_port }} &>>etcd.log &
+  become: true
+  args:
+    chdir: "{{ etcd_dir }}"
+  when: service_etcd_status.rc != 0
+
+- name: check etcd cluster health
+  shell: ./etcdctl cluster-health
+  become: true
+  ignore_errors: true
+  args:
+    chdir: "{{ etcd_dir }}"
diff --git a/ci/ansible/roles/osdsdb/tasks/main.yml b/ci/ansible/roles/osdsdb/tasks/main.yml
index 41cbd09..03530b4 100644..100755
--- a/ci/ansible/roles/osdsdb/tasks/main.yml
+++ b/ci/ansible/roles/osdsdb/tasks/main.yml
@@ -1,4 +1,8 @@
----

-- name: include scenarios/etcd.yml

-  include: scenarios/etcd.yml

-  when: db_driver == "etcd"
\ No newline at end of file
+---
+- name: include scenarios/etcd.yml
+  include: scenarios/etcd.yml
+  when: db_driver == "etcd" and container_enabled == false
+
+- name: include scenarios/container.yml
+  include: scenarios/container.yml
+  when: db_driver == "etcd" and container_enabled == true