From b9f16e2669ff5a0cde006951ffec5dff84ac29df Mon Sep 17 00:00:00 2001
From: leonwang <wanghui71@huawei.com>
Date: Fri, 23 Feb 2018 15:01:06 +0000
Subject: 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>
---
 ci/ansible/roles/osdsdock/tasks/main.yml | 75 +++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 31 deletions(-)
 mode change 100644 => 100755 ci/ansible/roles/osdsdock/tasks/main.yml

(limited to 'ci/ansible/roles/osdsdock/tasks/main.yml')

diff --git a/ci/ansible/roles/osdsdock/tasks/main.yml b/ci/ansible/roles/osdsdock/tasks/main.yml
old mode 100644
new mode 100755
index 2462905..68f9fdb
--- a/ci/ansible/roles/osdsdock/tasks/main.yml
+++ b/ci/ansible/roles/osdsdock/tasks/main.yml
@@ -1,31 +1,44 @@
----
-- name: include scenarios/lvm.yml
-  include: scenarios/lvm.yml
-  when: enabled_backend == "lvm"
-
-- name: include scenarios/ceph.yml
-  include: scenarios/ceph.yml
-  when: enabled_backend == "ceph"
-
-- name: include scenarios/cinder.yml
-  include: scenarios/cinder.yml
-  when: enabled_backend == "cinder" and use_cinder_standalone == false
-
-- name: include scenarios/cinder_standalone.yml
-  include: scenarios/cinder_standalone.yml
-  when: enabled_backend == "cinder" and use_cinder_standalone == true
-
-- name: run osdsdock daemon service
-  shell:
-    cmd: |
-      i=0
-      while
-        i="$((i+1))"
-        [ "$i" -lt 4 ]
-      do
-        nohup bin/osdsdock &>/dev/null &
-        sleep 5
-        ps aux | grep osdsdock | grep -v grep && break
-      done
-  args:
-    chdir: "{{ opensds_build_dir }}/out"
+---
+- name: include scenarios/lvm.yml
+  include: scenarios/lvm.yml
+  when: enabled_backend == "lvm"
+
+- name: include scenarios/ceph.yml
+  include: scenarios/ceph.yml
+  when: enabled_backend == "ceph"
+
+- name: include scenarios/cinder.yml
+  include: scenarios/cinder.yml
+  when: enabled_backend == "cinder" and use_cinder_standalone == false
+
+- name: include scenarios/cinder_standalone.yml
+  include: scenarios/cinder_standalone.yml
+  when: enabled_backend == "cinder" and use_cinder_standalone == true
+
+- name: run osdsdock daemon service
+  shell:
+    cmd: |
+      i=0
+      while
+        i="$((i+1))"
+        [ "$i" -lt 4 ]
+      do
+        nohup bin/osdsdock &>/dev/null &
+        sleep 5
+        ps aux | grep osdsdock | grep -v grep && break
+      done
+  args:
+    chdir: "{{ opensds_build_dir }}/out"
+  when: container_enabled == false
+
+- name: run osdsdock containerized service
+  docker:
+    name: osdsdock
+    image: opensdsio/opensds-dock:latest
+    state: started
+    net: host
+    privileged: true
+    volumes:
+    - "/etc/opensds/:/etc/opensds"
+    - "/etc/ceph/:/etc/ceph"
+  when: container_enabled == true
-- 
cgit 1.2.3-korg