Minor tweaks to example and development vagrantfiles
This commit is contained in:
parent
8bc04707fa
commit
6c8f9d695a
2 changed files with 8 additions and 4 deletions
5
development/Vagrantfile
vendored
5
development/Vagrantfile
vendored
|
@ -21,6 +21,7 @@ def local_gem_cache(box_name)
|
||||||
cache_dir
|
cache_dir
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Required to make sure vagrant picks it up during development
|
||||||
Vagrant.require_plugin 'vagrant-lxc'
|
Vagrant.require_plugin 'vagrant-lxc'
|
||||||
|
|
||||||
Vagrant.configure("2") do |config|
|
Vagrant.configure("2") do |config|
|
||||||
|
@ -50,13 +51,15 @@ Vagrant.configure("2") do |config|
|
||||||
|
|
||||||
config.vm.define :lxc do |lxc_config|
|
config.vm.define :lxc do |lxc_config|
|
||||||
lxc_config.vm.hostname = 'lxc-dev-box'
|
lxc_config.vm.hostname = 'lxc-dev-box'
|
||||||
|
lxc_config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-26.box'
|
||||||
# Uncomment to test boxes built locally:
|
# Uncomment to test boxes built locally:
|
||||||
# lxc_config.vm.box_url = '../boxes/output/lxc-quantal64.box'
|
# lxc_config.vm.box_url = '../boxes/output/lxc-quantal64.box'
|
||||||
lxc_config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-26.box'
|
|
||||||
|
|
||||||
lxc_config.vm.provider :lxc do |lxc|
|
lxc_config.vm.provider :lxc do |lxc|
|
||||||
# Required to boot nested containers
|
# Required to boot nested containers
|
||||||
lxc.start_opts << 'lxc.aa_profile=unconfined'
|
lxc.start_opts << 'lxc.aa_profile=unconfined'
|
||||||
|
# Change this to override the path where the rootfs gets stored
|
||||||
|
# lxc.target_rootfs_path = '/path/to/vagrant-lxc-dev-box-rootfs'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
7
example/Vagrantfile
vendored
7
example/Vagrantfile
vendored
|
@ -11,12 +11,15 @@ def local_cache(box_name)
|
||||||
cache_dir
|
cache_dir
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Not really needed, but useful while developing so that vagrant picks it up
|
||||||
Vagrant.require_plugin 'vagrant-lxc'
|
Vagrant.require_plugin 'vagrant-lxc'
|
||||||
|
|
||||||
Vagrant.configure("2") do |config|
|
Vagrant.configure("2") do |config|
|
||||||
config.vm.box = "quantal64"
|
config.vm.box = "quantal64"
|
||||||
config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-26.box'
|
config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-26.box'
|
||||||
config.vm.hostname = 'lxc-quantal64'
|
# Uncomment if you want to try out a box built locally
|
||||||
|
# config.vm.box_url = '../boxes/output/lxc-quantal64.box'
|
||||||
|
config.vm.hostname = 'lxc-quantal64-example'
|
||||||
|
|
||||||
config.vm.synced_folder "/tmp", "/vagrant_data"
|
config.vm.synced_folder "/tmp", "/vagrant_data"
|
||||||
|
|
||||||
|
@ -36,8 +39,6 @@ echo "Hi there I'm a shell script used for provisioning"
|
||||||
puppet.module_path = "puppet/modules"
|
puppet.module_path = "puppet/modules"
|
||||||
puppet.manifests_path = "puppet/manifests"
|
puppet.manifests_path = "puppet/manifests"
|
||||||
puppet.manifest_file = "site.pp"
|
puppet.manifest_file = "site.pp"
|
||||||
# If you want to make some debugging noise
|
|
||||||
# puppet.options << [ '--verbose', '--debug' ]
|
|
||||||
end
|
end
|
||||||
|
|
||||||
config.vm.provision :chef_solo do |chef|
|
config.vm.provision :chef_solo do |chef|
|
||||||
|
|
Loading…
Reference in a new issue