X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fansible%2Froles%2Fosdsdock%2Ftasks%2Fmain.yml;h=dc803b56919ac94d56aac1c9811dc457d3248300;hb=91a84330494b100ac9077652c910fb248f737717;hp=215cf000e9e3df718fd1aa105f8192d11e4329c9;hpb=6bc7e08cc5d80941c80e8d36d3a2b1373f147a05;p=stor4nfv.git

diff --git a/ci/ansible/roles/osdsdock/tasks/main.yml b/ci/ansible/roles/osdsdock/tasks/main.yml
index 215cf00..dc803b5 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
@@ -28,17 +42,21 @@
         ps aux | grep osdsdock | grep -v grep && break
       done
   args:
-    chdir: "{{ opensds_dir }}"
-  when: container_enabled == false
+    chdir: "{{ opensds_work_dir }}"
+  when: install_from != "container"
 
 - name: run osdsdock containerized service
-  docker:
+  docker_container:
     name: osdsdock
-    image: opensdsio/opensds-dock:latest
+    image: "{{ dock_docker_image }}"
     state: started
-    net: host
+    network_mode: host
     privileged: true
     volumes:
-    - "/etc/opensds/:/etc/opensds"
-    - "/etc/ceph/:/etc/ceph"
-  when: container_enabled == true
+    - "/etc/opensds:/etc/opensds"
+    - "/etc/ceph:/etc/ceph"
+    - "/dev/:/dev/"
+    - "/run/:/run/:shared"
+    - "/etc/localtime:/etc/localtime:ro"
+    - "/lib/modules:/lib/modules:ro"
+  when: install_from == "container"