X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fansible%2Froles%2Fosdsdock%2Ftasks%2Fmain.yml;h=8b18c8d3fa0b397666809cc9884c266fb4903135;hb=078bb837513f3b83fdd07f2e10f9abeb0bd485db;hp=24629053dfd261350fe20c47ffe77219572891c1;hpb=64df7bc3bc70d49153409436b411fb327691a4d5;p=stor4nfv.git

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