Update stor4nfv install scripts according to opensds aruba release

[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
index 2462905..8b18c8d 100644 (file)
--- a/ci/ansible/roles/osdsdock/tasks/main.yml
+++ b/ci/ansible/roles/osdsdock/tasks/main.yml
@@ -1,3 +1,17 @@
+# Copyright (c) 2018 Huawei Technologies Co., Ltd. All Rights Reserved.\r
+#\r
+# Licensed under the Apache License, Version 2.0 (the "License");\r
+# you may not use this file except in compliance with the License.\r
+# You may obtain a copy of the License at\r
+#\r
+#     http://www.apache.org/licenses/LICENSE-2.0\r
+#\r
+# Unless required by applicable law or agreed to in writing, software\r
+# distributed under the License is distributed on an "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+# See the License for the specific language governing permissions and\r
+# limitations under the License.\r
+\r
 ---\r
 - name: include scenarios/lvm.yml\r
   include: scenarios/lvm.yml\r
@@ -23,9 +37,22 @@
         i="$((i+1))"\r
         [ "$i" -lt 4 ]\r
       do\r
-        nohup bin/osdsdock &>/dev/null &\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_build_dir }}/out"\r
+    chdir: "{{ opensds_work_dir }}"\r
+  when: container_enabled == false\r
+\r
+- name: run osdsdock containerized service\r
+  docker_container:\r
+    name: osdsdock\r
+    image: opensdsio/opensds-dock:latest\r
+    state: started\r
+    network_mode: host\r
+    privileged: true\r
+    volumes:\r
+    - "/etc/opensds/:/etc/opensds"\r
+    - "/etc/ceph/:/etc/ceph"\r
+  when: container_enabled == true\r