Skip to content

Commit

Permalink
Reverted back as I ran into the same issues outlined here: hashicorp/…
Browse files Browse the repository at this point in the history
  • Loading branch information
craighurley committed Jun 18, 2015
1 parent ff7157b commit 304177a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 17 deletions.
27 changes: 10 additions & 17 deletions Vagrantfile
@@ -1,15 +1,8 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

# development, staging or production
environment = "development"

# ansible settings
ansible_playbook = "vps.yml"
ansible_log_level = "v"

# get details of boxes to build
boxes = YAML.load_file("boxes.yml")
boxes = YAML.load_file('boxes.yml')

Vagrant.configure(2) do |config|
# Enable hostmanager plugin
Expand Down Expand Up @@ -49,15 +42,15 @@ Vagrant.configure(2) do |config|
vb.customize ["modifyvm", :id, "--name", box["name"]]
vb.customize ["modifyvm", :id, "--description", box["description"]]
end
end
end

# provision boxes using ansible
config.vm.provision :ansible do |ansible|
ansible.playbook = ansible_playbook
ansible.verbose = ansible_log_level
ansible.extra_vars = {
v_environment: environment
}
# Configure box
box_config.vm.provision :ansible do |ansible|
ansible.playbook = box["ansible_playbook"]
ansible.verbose = box["ansible_log_level"]
ansible.extra_vars = {
v_environment: box["environment"]
}
end
end
end
end
3 changes: 3 additions & 0 deletions boxes.yml
Expand Up @@ -3,6 +3,9 @@
description: Personal VPS
box: puppetlabs/centos-7.0-64-puppet
box_version: 1.0.1
ansible_playbook: vps.yml
ansible_log_level: v
environment: development
cpus: 1
cpu_execution_cap: 90
ram: 1024
Expand Down

0 comments on commit 304177a

Please sign in to comment.