Merge nbp installation into opensds ansible script

In this update, the nbp-ansible is removed from stor4nfv repo and
all code has been merged into ansible repo. Besides, the latest
update reduce a lot of work to download and build opensds source
code. And some installation docs are also updated.

Remove license statement for the moment.

Change-Id: Ib8504d96e2d41e1c3ab7e0c94689111679d56abd
Signed-off-by: leonwang <wanghui71@huawei.com>

1 files changed, 44 insertions, 44 deletions

diff --git a/ci/ansible/roles/osdsdock/tasks/main.yml b/ci/ansible/roles/osdsdock/tasks/main.yml
index 68f9fdb..215cf00 100755..100644
--- 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
+---

+- 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 > osdsdock.out 2> osdsdock.err < /dev/null &

+        sleep 5

+        ps aux | grep osdsdock | grep -v grep && break

+      done

+  args:

+    chdir: "{{ opensds_dir }}"

+  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