Merge pull request #1673 from ceph/add_to_e5d06a4

vagrantfile: Ensure `devices` variable is a list
pull/1674/merge
Guits 2017-07-13 09:43:46 +02:00 committed by GitHub
commit 1634087b4c
3 changed files with 5 additions and 5 deletions

View File

@ -22,7 +22,7 @@ cluster_subnet: 192.168.1
# MEMORY # MEMORY
memory: 1024 memory: 1024
disks: "[ '/dev/sda', '/dev/sdb' ]" disks: [ '/dev/sda', '/dev/sdb' ]
eth: 'enp0s8' eth: 'enp0s8'
vagrant_box: centos/atomic-host vagrant_box: centos/atomic-host

View File

@ -22,7 +22,7 @@ public_subnet: 172.17.72
cluster_subnet: 172.17.72 cluster_subnet: 172.17.72
# For Openstack VMs, the disk will depend on what you are allocated # For Openstack VMs, the disk will depend on what you are allocated
disks: "[ '/dev/vdb' ]" disks: [ '/dev/vdb' ]
# For Openstack VMs, the lan is usually eth0 # For Openstack VMs, the lan is usually eth0
eth: 'eth0' eth: 'eth0'

View File

@ -30,9 +30,9 @@ memory: 512
eth: 'eth1' eth: 'eth1'
# Disks # Disks
# For Xenial use disks: "[ '/dev/sdb', '/dev/sdc' ]" # For Xenial use disks: [ '/dev/sdb', '/dev/sdc' ]
# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" # For CentOS7 use disks: [ '/dev/sda', '/dev/sdb' ]
disks: "[ '/dev/sdb', '/dev/sdc' ]" disks: [ '/dev/sdb', '/dev/sdc' ]
# VAGRANT BOX # VAGRANT BOX
# Ceph boxes are *strongly* suggested. They are under better control and will # Ceph boxes are *strongly* suggested. They are under better control and will