summaryrefslogtreecommitdiffstats
path: root/ci/ansible/roles/osdsdock/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/osdsdock/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/osdsdock/tasks')
-rwxr-xr-x[-rw-r--r--]ci/ansible/roles/osdsdock/tasks/main.yml75
1 files changed, 44 insertions, 31 deletions
diff --git a/ci/ansible/roles/osdsdock/tasks/main.yml b/ci/ansible/roles/osdsdock/tasks/main.yml
index 2462905..68f9fdb 100644..100755
--- 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