From b9f16e2669ff5a0cde006951ffec5dff84ac29df Mon Sep 17 00:00:00 2001 From: leonwang 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 --- ci/ansible/roles/osdsdb/tasks/main.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) mode change 100644 => 100755 ci/ansible/roles/osdsdb/tasks/main.yml (limited to 'ci/ansible/roles/osdsdb/tasks/main.yml') diff --git a/ci/ansible/roles/osdsdb/tasks/main.yml b/ci/ansible/roles/osdsdb/tasks/main.yml old mode 100644 new mode 100755 index 41cbd09..03530b4 --- 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 -- cgit 1.2.3-korg