1 files changed, 31 insertions, 22 deletions
diff --git a/ci/ansible/group_vars/osdsdock.yml b/ci/ansible/group_vars/osdsdock.yml
index edbfa2a..e23a546 100644
--- a/ci/ansible/group_vars/osdsdock.yml
+++ b/ci/ansible/group_vars/osdsdock.yml
@@ -1,15 +1,22 @@
----
-# Variables here are applicable to all host groups NOT roles
-
-# This sample file generated by generate_group_vars_sample.sh
+# 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.
 
+---
 # Dummy variable to avoid error because ansible does not recognize the
 # file as a good configuration file when no variable in it.
 dummy:
 
-# You can override default vars defined in defaults/main.yml here,
-# but I would advice to use host or group vars instead
-
 
 ###########
 # GENERAL #
@@ -17,35 +24,44 @@ dummy:
 
 # Change it according to your backend, currently support 'lvm', 'ceph', 'cinder'
 enabled_backend: lvm
+# Change it according to your node type (host or target), currently support
+# 'provisioner', 'attacher'
+dock_type: provisioner
 
 # These fields are NOT suggested to be modified
 dock_endpoint: localhost:50050
 dock_log_file: "{{ opensds_log_dir }}/osdsdock.log"
 
+
 ###########
 #   LVM   #
 ###########
 
-pv_device: /dev/sdb # Specify a block device and ensure it existed if you choose lvm
-vg_name: vg001 # Specify a name randomly
 
 # These fields are NOT suggested to be modified
 lvm_name: lvm backend
 lvm_description: This is a lvm backend service
 lvm_driver_name: lvm
-lvm_config_path: "{{ opensds_config_dir }}/driver/lvm.yaml"
+lvm_config_path: "{{ opensds_driver_config_dir }}/lvm.yaml"
+opensds_volume_group: opensds-volumes
+
+
 
 ###########
 #  CEPH   #
 ###########
 
-ceph_pool_name: rbd # Specify a name randomly
+ceph_pools: # Specify pool name randomly
+  - rbd
+  #- ssd
+  #- sas
 
 # These fields are NOT suggested to be modified
 ceph_name: ceph backend
 ceph_description: This is a ceph backend service
 ceph_driver_name: ceph
-ceph_config_path: "{{ opensds_config_dir }}/driver/ceph.yaml"
+ceph_config_path: "{{ opensds_driver_config_dir }}/ceph.yaml"
+
 
 ###########
 # CINDER  #
@@ -67,17 +83,10 @@ cinder_image_tag: debian-cinder
 # removed when use ansible script clean environment.
 cinder_volume_group: cinder-volumes
 # All source code and volume group file will be placed in the cinder_data_dir:
-cinder_data_dir: "{{ workplace }}/cinder_data_dir"
-
+cinder_data_dir: "/opt/cinder_data_dir"
 
-# These fields are not suggested to be modified
+# These fields are NOT suggested to be modified
 cinder_name: cinder backend
 cinder_description: This is a cinder backend service
 cinder_driver_name: cinder
-cinder_config_path: "{{ opensds_config_dir }}/driver/cinder.yaml"
-
-###########
-# DOCKER  #
-###########
-
-dock_docker_image: dockerio/opensds-dock:zealand
+cinder_config_path: "{{ opensds_driver_config_dir }}/cinder.yaml"