From 6bc7e08cc5d80941c80e8d36d3a2b1373f147a05 Mon Sep 17 00:00:00 2001
From: leonwang <wanghui71@huawei.com>
Date: Thu, 15 Mar 2018 08:25:05 +0000
Subject: 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>
---
 ci/ansible/roles/osdslet/tasks/main.yml | 52 ++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 26 deletions(-)
 mode change 100755 => 100644 ci/ansible/roles/osdslet/tasks/main.yml

(limited to 'ci/ansible/roles/osdslet')

diff --git a/ci/ansible/roles/osdslet/tasks/main.yml b/ci/ansible/roles/osdslet/tasks/main.yml
old mode 100755
new mode 100644
index 14ab40e..02b71fc
--- a/ci/ansible/roles/osdslet/tasks/main.yml
+++ b/ci/ansible/roles/osdslet/tasks/main.yml
@@ -1,26 +1,26 @@
----
-- 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
+---
+- 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_dir }}"
+  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
-- 
cgit 1.2.3-korg