Merge nbp installation into opensds ansible script

[stor4nfv.git] / ci / ansible / group_vars / osdsdock.yml

diff --git a/ci/ansible/group_vars/osdsdock.yml b/ci/ansible/group_vars/osdsdock.yml
index edbfa2a..1544c65 100644 (file)
--- a/ci/ansible/group_vars/osdsdock.yml
+++ b/ci/ansible/group_vars/osdsdock.yml
@@ -1,15 +1,8 @@
 ---\r
-# Variables here are applicable to all host groups NOT roles\r
-\r
-# This sample file generated by generate_group_vars_sample.sh\r
-\r
 # Dummy variable to avoid error because ansible does not recognize the\r
 # file as a good configuration file when no variable in it.\r
 dummy:\r
 \r
-# You can override default vars defined in defaults/main.yml here,\r
-# but I would advice to use host or group vars instead\r
-\r
 \r
 ###########\r
 # GENERAL #\r
@@ -26,7 +19,9 @@ dock_log_file: "{{ opensds_log_dir }}/osdsdock.log"
 #   LVM   #\r
 ###########\r
 \r
-pv_device: /dev/sdb # Specify a block device and ensure it existed if you choose lvm\r
+pv_devices: # Specify block devices and ensure them existed if you choose lvm\r
+  #- /dev/sdc\r
+  #- /dev/sdd\r
 vg_name: vg001 # Specify a name randomly\r
 \r
 # These fields are NOT suggested to be modified\r
@@ -39,7 +34,10 @@ lvm_config_path: "{{ opensds_config_dir }}/driver/lvm.yaml"
 #  CEPH   #\r
 ###########\r
 \r
-ceph_pool_name: rbd # Specify a name randomly\r
+ceph_pools: # Specify pool name randomly\r
+  - rbd\r
+  #- ssd\r
+  #- sas\r
 \r
 # These fields are NOT suggested to be modified\r
 ceph_name: ceph backend\r
@@ -80,4 +78,4 @@ cinder_config_path: "{{ opensds_config_dir }}/driver/cinder.yaml"
 # DOCKER  #\r
 ###########\r
 \r
-dock_docker_image: dockerio/opensds-dock:zealand\r
+dock_docker_image: opensdsio/opensds-dock:latest\r