ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #857 from dang/url 

Add URL option to vagrant
pull/848/head
Leseb 2016-06-22 18:22:08 +02:00 committed by GitHub
parent b9db42f33e 4a2a6513b6
commit 08af355161
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@ -15,6 +15,7 @@ RESTAPI = settings['restapi']
CLIENTS = settings['client_vms'] CLIENTS = settings['client_vms']
SUBNET = settings['subnet'] SUBNET = settings['subnet']
BOX = settings['vagrant_box'] BOX = settings['vagrant_box']
BOX_URL = settings['vagrant_box_url']
MEMORY = settings['memory'] MEMORY = settings['memory']
STORAGECTL = settings['vagrant_storagectl'] STORAGECTL = settings['vagrant_storagectl']
ETH = settings['eth'] ETH = settings['eth']
@ -100,6 +101,7 @@ end
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = BOX config.vm.box = BOX
config.vm.box_url = BOX_URL
config.ssh.insert_key = false # workaround for https://github.com/mitchellh/vagrant/issues/5048 config.ssh.insert_key = false # workaround for https://github.com/mitchellh/vagrant/issues/5048
# Faster bootup. Disable if you need this for libvirt # Faster bootup. Disable if you need this for libvirt

7
vagrant_variables.yml.sample
View File

@ -33,7 +33,6 @@ eth: 'eth1'
disks: "[ '/dev/sdb', '/dev/sdc' ]" disks: "[ '/dev/sdb', '/dev/sdc' ]"
# VAGRANT BOX # VAGRANT BOX
# Fedora: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
# Ubuntu: ubuntu/trusty64 or ubuntu/wily64 # Ubuntu: ubuntu/trusty64 or ubuntu/wily64
# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet # CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet
# libvirt CentOS: centos/7 # libvirt CentOS: centos/7
@ -43,6 +42,12 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= # - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ # - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
vagrant_box: ubuntu/trusty64 vagrant_box: ubuntu/trusty64
# VAGRANT URL
# This is a URL to download an image from an alternate location. vagrant_box
# above should be set to the filename of the image.
# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box
# vagrant_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
# use vagrant_storagectl: 'SATA Controller' for CentOS # use vagrant_storagectl: 'SATA Controller' for CentOS
vagrant_storagectl: 'SATAController' vagrant_storagectl: 'SATAController'