Update the latest version of ansible script

[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 215cf00..dc803b5 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
@@ -28,17 +42,21 @@
         ps aux | grep osdsdock | grep -v grep && break\r
       done\r
   args:\r
-    chdir: "{{ opensds_dir }}"\r
-  when: container_enabled == false\r
+    chdir: "{{ opensds_work_dir }}"\r
+  when: install_from != "container"\r
 \r
 - name: run osdsdock containerized service\r
-  docker:\r
+  docker_container:\r
     name: osdsdock\r
-    image: opensdsio/opensds-dock:latest\r
+    image: "{{ dock_docker_image }}"\r
     state: started\r
-    net: host\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
+    - "/etc/opensds:/etc/opensds"\r
+    - "/etc/ceph:/etc/ceph"\r
+    - "/dev/:/dev/"\r
+    - "/run/:/run/:shared"\r
+    - "/etc/localtime:/etc/localtime:ro"\r
+    - "/lib/modules:/lib/modules:ro"\r
+  when: install_from == "container"\r