summaryrefslogtreecommitdiffstats
path: root/ci/ansible/roles/osdsdb/tasks
diff options
context:
space:
mode:
authorleonwang <wanghui71@huawei.com>2018-02-23 15:01:06 +0000
committerleonwang <wanghui71@huawei.com>2018-02-23 15:01:14 +0000
commitb9f16e2669ff5a0cde006951ffec5dff84ac29df (patch)
tree68fb97c133f6ffc7a46bbc988941955b35d91af2 /ci/ansible/roles/osdsdb/tasks
parent561c0708b78eed8120b90f0221cd66730c9e8a74 (diff)
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>
Diffstat (limited to 'ci/ansible/roles/osdsdb/tasks')
-rwxr-xr-x[-rw-r--r--]ci/ansible/roles/osdsdb/tasks/main.yml12
1 files changed, 8 insertions, 4 deletions
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