Streamline file naming standards, add multi-platform support

Continue standardizing on `machines.yml` instead of `servers.yml` for external data file. Add multi-platform support to environments via provider overrides.
This commit is contained in:
Scott S. Lowe 2016-09-14 16:47:11 -06:00
parent c30b1b5f53
commit e7723290ef
11 changed files with 93 additions and 94 deletions

30
consul/Vagrantfile vendored
View file

@ -10,8 +10,8 @@ ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
require 'yaml'
# Read YAML file with VM details (box, CPU, RAM, IP addresses)
# Be sure to edit servers.yml to provide correct IP addresses
servers = YAML.load_file(File.join(File.dirname(__FILE__), 'servers.yml'))
# Be sure to edit machines.yml to provide correct IP addresses
machines = YAML.load_file(File.join(File.dirname(__FILE__), 'machines.yml'))
# Create and configure the VMs
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
@ -20,18 +20,18 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.ssh.insert_key = false
# Iterate through entries in YAML file to create VMs
servers.each do |server|
config.vm.define server['name'] do |srv|
machines.each do |machine|
config.vm.define machine['name'] do |srv|
# Don't check for box updates
srv.vm.box_check_update = false
# Specify hostname and Vagrant box
srv.vm.hostname = server['name']
srv.vm.box = server['vmw_box']
srv.vm.hostname = machine['name']
srv.vm.box = machine['vmw_box']
# Assign an additional static private network
srv.vm.network 'private_network', ip: server['priv_ip']
srv.vm.network 'private_network', ip: machine['priv_ip']
# Specify default synced folder; requires VMware Tools
srv.vm.synced_folder '.', '/vagrant', disabled: true
@ -43,18 +43,18 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Provision consul to the VMs
srv.vm.provision 'shell', path: 'consul.sh'
# Configure VMs with RAM and CPUs per settings in servers.yml (Fusion)
# Configure VMs with RAM and CPUs per settings in machines.yml (Fusion)
srv.vm.provider 'vmware_fusion' do |vmw|
vmw.vmx['memsize'] = server['ram']
vmw.vmx['numvcpus'] = server['vcpu']
vmw.vmx['memsize'] = machine['ram']
vmw.vmx['numvcpus'] = machine['vcpu']
end # srv.vm.provider vmware_fusion
# Configure VMs with RAM and CPUs per settings in servers.yml (VirtualBox)
# Configure VMs with RAM and CPUs per settings in machines.yml (VirtualBox)
srv.vm.provider 'virtualbox' do |vb, override|
vb.memory = server['ram']
vb.cpus = server['vcpu']
override.vm.box = server['vb_box']
vb.memory = machine['ram']
vb.cpus = machine['vcpu']
override.vm.box = machine['vb_box']
end # srv.vm.provider virtualbox
end # config.vm.define
end # servers.each
end # machines.each
end # Vagrant.configure

View file

@ -10,7 +10,7 @@ ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
require 'yaml'
# Read YAML file with VM details (box, CPU, and RAM)
servers = YAML.load_file(File.join(File.dirname(__FILE__), 'servers.yml'))
machines = YAML.load_file(File.join(File.dirname(__FILE__), 'machines.yml'))
# Create and configure the VMs
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
@ -19,29 +19,29 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.ssh.insert_key = false
# Iterate through entries in YAML file to create VMs
servers.each do |servers|
config.vm.define servers['name'] do |srv|
machines.each do |machine|
config.vm.define machine['name'] do |srv|
# Don't check for box updates
srv.vm.box_check_update = false
srv.vm.hostname = servers['name']
srv.vm.box = servers['vmw_box']
srv.vm.hostname = machine['name']
srv.vm.box = machine['vmw_box']
# Disable default synced folder
srv.vm.synced_folder '.', '/vagrant', disabled: true
# Configure VMs with RAM and CPUs per servers.yml (Fusion)
# Configure VMs with RAM and CPUs per machines.yml (Fusion)
srv.vm.provider 'vmware_fusion' do |vmw|
vmw.vmx['memsize'] = servers['ram']
vmw.vmx['numvcpus'] = servers['vcpu']
vmw.vmx['memsize'] = machine['ram']
vmw.vmx['numvcpus'] = machine['vcpu']
end # srv.vm.provider vmware_fusion
# Configure the VM with RAM and CPUs per servers.yml (VirtualBox)
# Configure the VM with RAM and CPUs per machines.yml (VirtualBox)
srv.vm.provider 'virtualbox' do |vb, override|
vb.memory = servers['ram']
vb.cpus = servers['vcpu']
override.vm.box = servers['vb_box']
vb.memory = machine['ram']
vb.cpus = machine['vcpu']
override.vm.box = machine['vb_box']
end # srv.vm.provider virtualbox
end # config.vm.define
end # servers.each
end # machines.each
end # Vagrant.configure

View file

@ -1,5 +1,5 @@
---
- name: generic
- name: jessie
vmw_box: slowe/debian-81-x64
vb_box: debian/jessie64
ram: 1024

View file

@ -2,66 +2,64 @@
# vi: set ft=ruby :
# Specify Vagrant version, Vagrant API version, and Vagrant clone location
# Adjust commented lines to specify provider
Vagrant.require_version ">= 1.6.0"
VAGRANTFILE_API_VERSION = "2"
ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
Vagrant.require_version '>= 1.6.0'
VAGRANTFILE_API_VERSION = '2'
ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
# Require 'yaml' module
require 'yaml'
# Read YAML file to get VM configuration information
# Read YAML file with VM details (box, CPU, and RAM)
# Edit servers.yml to change VM configuration details
servers = YAML.load_file(File.join(File.dirname(__FILE__), 'servers.yml'))
machines = YAML.load_file(File.join(File.dirname(__FILE__), 'machines.yml'))
# Look for user-data and meta-data files in same directory
USER_DATA = File.join(File.dirname(__FILE__), "user-data")
META_DATA = File.join(File.dirname(__FILE__), "meta-data")
USER_DATA = File.join(File.dirname(__FILE__), 'user-data')
META_DATA = File.join(File.dirname(__FILE__), 'meta-data')
# Create and configure the VMs
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Use Vagrant's default insecure SSH key
# Always use Vagrant's default insecure key
config.ssh.insert_key = false
# Iterate through entries in YAML file to create VMs
servers.each do |servers|
machines.each do |machine|
# Configure the VMs per details in servers.yml
config.vm.define servers["name"] do |srv|
# Configure the VMs per details in machines.yml
config.vm.define machine['name'] do |srv|
# Don't check for box updates
srv.vm.box_check_update = false
# Specify the hostname of the VM
srv.vm.hostname = servers["name"]
srv.vm.hostname = machine['name']
# Specify the Vagrant box to use
srv.vm.box = servers["box"]
# Specify the Vagrant box to use (use VMware box by default)
srv.vm.box = machine['vmw_box']
# Disable default synced folder (not supported with Photon)
srv.vm.synced_folder ".", "/vagrant", disabled: true
srv.vm.synced_folder '.', '/vagrant', disabled: true
# Configure VMs with RAM and CPUs per servers.yml (Fusion)
srv.vm.provider :vmware_fusion do |vmw|
vmw.vmx["memsize"] = servers["ram"]
vmw.vmx["numvcpus"] = servers["vcpu"]
end # srv.vm.provider vmware_fusion
# Configure VMs with RAM and CPUs per machines.yml (Fusion)
srv.vm.provider 'vmware_fusion' do |vmw|
vmw.vmx['memsize'] = machine['ram']
vmw.vmx['numvcpus'] = machine['vcpu']
end # srv.vm.provider 'vmware_fusion'
# Configure VMs with RAM and CPUs per servers.yml (VirtualBox)
srv.vm.provider :virtualbox do |vb|
vb.memory = servers["ram"]
vb.cpus = servers["vcpu"]
end # srv.vm.provider virtualbox
# Configure VMs with RAM and CPU per machines.yml (VirtualBox)
srv.vm.provider 'virtualbox' do |vb, override|
vb.memory = machine['ram']
vb.cpus = machine['vcpu']
override.vm.box = machine['vb_box']
end # srv.vm.provider 'virtualbox'
# Configure Photon boxes to use cloud-init
if srv.vm.box == "vmware/photon"
srv.vm.provision "file", source: "#{USER_DATA}", destination: "/home/vagrant/user-data"
srv.vm.provision "file", source: "#{META_DATA}", destination: "/home/vagrant/meta-data"
srv.vm.provision "shell", path: "setup.sh", privileged: true
if srv.vm.box == 'vmware/photon'
srv.vm.provision 'file', source: "#{USER_DATA}", destination: '/home/vagrant/user-data'
srv.vm.provision 'file', source: "#{META_DATA}", destination: '/home/vagrant/meta-data'
srv.vm.provision 'shell', path: 'setup.sh', privileged: true
end # if srv.vm.box
end # config.vm.define
end # servers.each
end # machines.each
end # Vagrant.configure

View file

@ -0,0 +1,6 @@
---
- name: photon-01
vmw_box: vmware/photon
vb_box: vmware/photon
ram: "512"
vcpu: "1"

View file

@ -1,5 +0,0 @@
---
- name: photon-01
box: vmware/photon
ram: "512"
vcpu: "1"

28
photon/Vagrantfile vendored
View file

@ -11,7 +11,7 @@ require 'yaml'
# Read YAML file with VM details (box, CPU, and RAM)
# Edit servers.yml to change VM configuration details
servers = YAML.load_file(File.join(File.dirname(__FILE__), 'servers.yml'))
machines = YAML.load_file(File.join(File.dirname(__FILE__), 'machines.yml'))
# Create and configure the VMs
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
@ -20,35 +20,35 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.ssh.insert_key = false
# Iterate through entries in YAML file to create VMs
servers.each do |servers|
machines.each do |machine|
# Configure the VMs per details in servers.yml
config.vm.define servers['name'] do |srv|
# Configure the VMs per details in machines.yml
config.vm.define machine['name'] do |srv|
# Don't check for box updates
srv.vm.box_check_update = false
# Specify the hostname of the VM
srv.vm.hostname = servers['name']
srv.vm.hostname = machine['name']
# Specify the Vagrant box to use (use VMware box by default)
srv.vm.box = servers['vmw_box']
srv.vm.box = machine['vmw_box']
# Disable default synced folder (not supported with Photon)
srv.vm.synced_folder '.', '/vagrant', disabled: true
# Configure VMs with RAM and CPUs per servers.yml (Fusion)
# Configure VMs with RAM and CPUs per machines.yml (Fusion)
srv.vm.provider 'vmware_fusion' do |vmw|
vmw.vmx['memsize'] = servers['ram']
vmw.vmx['numvcpus'] = servers['vcpu']
vmw.vmx['memsize'] = machine['ram']
vmw.vmx['numvcpus'] = machine['vcpu']
end # srv.vm.provider 'vmware_fusion'
# Configure VMs with RAM and CPU per servers.yml (VirtualBox)
# Configure VMs with RAM and CPU per machines.yml (VirtualBox)
srv.vm.provider 'virtualbox' do |vb, override|
vb.memory = servers['ram']
vb.cpus = servers['vcpu']
override.vm.box = servers['vb_box']
vb.memory = machine['ram']
vb.cpus = machine['vcpu']
override.vm.box = machine['vb_box']
end # srv.vm.provider 'virtualbox'
end # config.vm.define
end # servers.each
end # machines.each
end # Vagrant.configure

View file

@ -10,7 +10,7 @@ ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
require 'yaml'
# Read YAML file with VM details (box, CPU, and RAM)
servers = YAML.load_file(File.join(File.dirname(__FILE__), 'servers.yml'))
machines = YAML.load_file(File.join(File.dirname(__FILE__), 'machines.yml'))
# Create and configure the VMs
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
@ -19,29 +19,29 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.ssh.insert_key = false
# Iterate through entries in YAML file to create VMs
servers.each do |servers|
config.vm.define servers['name'] do |srv|
machines.each do |machine|
config.vm.define machine['name'] do |srv|
# Don't check for box updates
srv.vm.box_check_update = false
srv.vm.hostname = servers['name']
srv.vm.box = servers['vmw_box']
srv.vm.hostname = machine['name']
srv.vm.box = machine['vmw_box']
# Disable default synced folder
srv.vm.synced_folder '.', '/vagrant', disabled: true
# Configure VMs with RAM and CPUs per settings in servers.yml (Fusion)
# Configure VMs with RAM and CPUs per settings in machines.yml (Fusion)
srv.vm.provider 'vmware_fusion' do |vmw|
vmw.vmx['memsize'] = servers['ram']
vmw.vmx['numvcpus'] = servers['vcpu']
vmw.vmx['memsize'] = machine['ram']
vmw.vmx['numvcpus'] = machine['vcpu']
end # srv.vm.provider vmware_fusion
# Configure VMs with RAM and CPUs per settings in servers.yml (VirtualBox)
# Configure VMs with RAM and CPUs per settings in machines.yml (VirtualBox)
srv.vm.provider 'virtualbox' do |vb, override|
vb.memory = servers['ram']
vb.cpus = servers['vcpu']
override.vm.box = servers['vb_box']
vb.memory = machine['ram']
vb.cpus = machine['vcpu']
override.vm.box = machine['vb_box']
end # srv.vm.provider virtualbox
end # config.vm.define
end # servers.each
end # machines.each
end # Vagrant.configure

View file

@ -1,5 +1,5 @@
---
- name: generic
- name: trusty
vmw_box: slowe/ubuntu-trusty-x64
vb_box: ubuntu/trusty64
ram: 1024