X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=stor4nfv.git;a=blobdiff_plain;f=ci%2Fansible%2Froles%2Fosdsdock%2Fscenarios%2Fcinder_standalone.yml;h=b62d2d15fd9f45945dc8744e8a09f52ebb900588;hp=49f4063ffbb22dfa3ce706ca50527b7a24f87377;hb=078bb837513f3b83fdd07f2e10f9abeb0bd485db;hpb=63ff6c6ec9ebbca90ac7304a27c0430dbcecb74f

diff --git a/ci/ansible/roles/osdsdock/scenarios/cinder_standalone.yml b/ci/ansible/roles/osdsdock/scenarios/cinder_standalone.yml
index 49f4063..b62d2d1 100644
--- a/ci/ansible/roles/osdsdock/scenarios/cinder_standalone.yml
+++ b/ci/ansible/roles/osdsdock/scenarios/cinder_standalone.yml
@@ -1,21 +1,42 @@
----
-- name: install python-pip
-  apt:
-    name: python-pip
-
-- name: install lvm2
-  apt:
-    name: lvm2
+# 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: install thin-provisioning-tools
+---
+- name: install python-pip, lvm2, thin-provisioning-tools and docker-compose
   apt:
-    name: thin-provisioning-tools
+    name: "{{ item }}"
+    state: present
+  with_items:
+    - python-pip
+    - lvm2
+    - thin-provisioning-tools
+    - docker-compose
+
+- name: configure cinder section in opensds global info if specify cinder backend
+  shell: |
+    cat >> opensds.conf <<OPENSDS_GLOABL_CONFIG_DOC
 
-- name: install docker-compose
-  pip:
-    name: docker-compose
+    [cinder]
+    name = {{ cinder_name }}
+    description = {{ cinder_description }}
+    driver_name = {{ cinder_driver_name }}
+    config_path = {{ cinder_config_path }}
+  args:
+    chdir: "{{ opensds_config_dir }}"
+  ignore_errors: yes
 
-- name: copy opensds cinder backend file if specify cinder backend
+- name: copy opensds cinder backend file to cinder config path if specify cinder backend
   copy:
     src: ../../../group_vars/cinder/cinder.yaml
     dest: "{{ cinder_config_path }}"
@@ -40,6 +61,11 @@
               local vg_dev
               vg_dev=`sudo losetup -f --show $backing_file`
 
+              # Only create physical volume if it doesn't already exist
+              if ! sudo pvs $vg_dev; then
+                  sudo pvcreate $vg_dev
+              fi
+
               # Only create volume group if it doesn't already exist
               if ! sudo vgs $vg; then
                   sudo vgcreate $vg $vg_dev
@@ -120,6 +146,8 @@
     sed -i "s/image: debian-cinder/image: {{ cinder_image_tag }}/g" docker-compose.yml
     sed -i "s/image: lvm-debian-cinder/image: lvm-{{ cinder_image_tag }}/g" docker-compose.yml
 
+    sed -i "s/3306:3306/3307:3306/g" docker-compose.yml
+
     sed -i "s/volume_group = cinder-volumes /volume_group = {{ cinder_volume_group }}/g" etc/cinder.conf
   become: true
   args:
@@ -141,5 +169,5 @@
   wait_for:
     host: 127.0.0.1
     port: 8776
-    delay: 2
+    delay: 15
     timeout: 120