Modify for better multi-platform support

Modify Vagrantfile for better multi-platform support. Fix errors/problems with setup script. Add necessary information to servers.yml.
This commit is contained in:
Scott Lowe 2016-04-05 20:03:14 -06:00
parent ab3a47eb7a
commit 5377fac7a8
3 changed files with 13 additions and 11 deletions

9
consul/Vagrantfile vendored
View file

@ -5,8 +5,6 @@
Vagrant.require_version '>= 1.6.0'
VAGRANTFILE_API_VERSION = '2'
ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
# Require 'yaml' module
require 'yaml'
@ -30,7 +28,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Specify hostname and Vagrant box
srv.vm.hostname = server['name']
srv.vm.box = server['box']
srv.vm.box = server['vmw_box']
# Assign an additional static private network
srv.vm.network 'private_network', ip: server['priv_ip']
@ -46,15 +44,16 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
srv.vm.provision 'shell', path: 'consul.sh'
# Configure VMs with RAM and CPUs per settings in servers.yml (Fusion)
srv.vm.provider :vmware_fusion do |vmw|
srv.vm.provider 'vmware_fusion' do |vmw|
vmw.vmx['memsize'] = server['ram']
vmw.vmx['numvcpus'] = server['vcpu']
end # srv.vm.provider vmware_fusion
# Configure VMs with RAM and CPUs per settings in servers.yml (VirtualBox)
srv.vm.provider :virtualbox do |vb|
srv.vm.provider 'virtualbox' do |vb, override|
vb.memory = server['ram']
vb.cpus = server['vcpu']
override.vm.box = server['vb_box']
end # srv.vm.provider virtualbox
end # config.vm.define
end # servers.each

View file

@ -17,11 +17,11 @@ fi
if [[ ! -e /usr/local/bin/consul ]];then
# Download Consul
curl -kLO https://dl.bintray.com/mitchellh/consul/0.5.2_linux_amd64.zip
curl -kLO https://releases.hashicorp.com/consul/0.5.2/consul_0.5.2_linux_amd64.zip
# Decompress and remove Consul download
unzip 0.5.2_linux_amd64.zip
rm 0.5.2_linux_amd64.zip
unzip consul_0.5.2_linux_amd64.zip
rm consul_0.5.2_linux_amd64.zip
# Move Consul binary to location in path
sudo mv consul /usr/local/bin/

View file

@ -1,16 +1,19 @@
---
- name: "consul-01"
box: "slowe/ubuntu-trusty-x64"
vmw_box: "slowe/ubuntu-trusty-x64"
vb_box: "ubuntu/trusty64"
ram: "512"
vcpu: "1"
priv_ip: 192.168.100.101
- name: "consul-02"
box: "slowe/ubuntu-trusty-x64"
vmw_box: "slowe/ubuntu-trusty-x64"
vb_box: "ubuntu/trusty64"
ram: "512"
vcpu: "1"
priv_ip: 192.168.100.102
- name: "consul-03"
box: "slowe/ubuntu-trusty-x64"
vmw_box: "slowe/ubuntu-trusty-x64"
vb_box: "ubuntu/trusty64"
ram: "512"
vcpu: "1"
priv_ip: 192.168.100.103