Merge nbp installation into opensds ansible script

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