Update opensds ansible

[stor4nfv.git] / ci / ansible / roles / osdslet / tasks / main.yml

diff --git a/ci/ansible/roles/osdslet/tasks/main.yml b/ci/ansible/roles/osdslet/tasks/main.yml
old mode 100644 (file)
new mode 100755 (executable)
index 2c3e0aa..14ab40e
--- a/ci/ansible/roles/osdslet/tasks/main.yml
+++ b/ci/ansible/roles/osdslet/tasks/main.yml
@@ -1,15 +1,26 @@
----\r
-- name: run osdslet daemon service\r
-  shell:\r
-    cmd: |\r
-      i=0\r
-      while\r
-        i="$((i+1))"\r
-        [ "$i" -lt 4 ]\r
-      do\r
-        nohup bin/osdslet > osdslet.out 2> osdslet.err < /dev/null &\r
-        sleep 5\r
-        ps aux | grep osdslet | grep -v grep && break\r
-      done\r
-  args:\r
-    chdir: "{{ opensds_build_dir }}/out"\r
+---
+- name: run osdslet daemon service
+  shell:
+    cmd: |
+      i=0
+      while
+        i="$((i+1))"
+        [ "$i" -lt 4 ]
+      do
+        nohup bin/osdslet > osdslet.out 2> osdslet.err < /dev/null &
+        sleep 5
+        ps aux | grep osdslet | grep -v grep && break
+      done
+  args:
+    chdir: "{{ opensds_build_dir }}/out"
+  when: container_enabled == false
+
+- name: run osdslet containerized service
+  docker:
+    name: osdslet
+    image: opensdsio/opensds-controller:latest
+    state: started
+    net: host
+    volumes:
+    - "/etc/opensds/:/etc/opensds"
+  when: container_enabled == true