glenux/vagrant-lxc-ng
glenux/vagrant-lxc-ng
1
0
Fork 0
Code Issues 4 Pull requests Projects 1 Releases Packages Wiki Activity

Remove shell provisioner script for installing puppet on containers

Browse source
This commit is contained in:
Fabio Rehm 2013-03-10 02:31:20 -03:00
parent 731ce84d5a
commit 4f6c2b717a
3 changed files with 3 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
development/Vagrantfile.lxc
View file

@ -14,9 +14,8 @@ end
Vagrant.require_plugin 'vagrant-lxc'
Vagrant.configure("2") do |config|
config.vm.box = "lxc-quantal64-2013-03-08"
config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-08.box'
config.vm.hostname = "lxc-quantal64"
config.vm.box = "lxc-quantal64-2013-03-10"
config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-10.box'
config.vm.synced_folder "../", "/vagrant", name: 'vagrant-root'
@ -30,8 +29,6 @@ Vagrant.configure("2") do |config|
lxc.start_opts << 'lxc.aa_profile=unconfined'
end
config.vm.provision :shell, :path => 'shell-provisioning/install-puppet'
config.vm.provision :puppet do |puppet|
puppet.manifests_path = "."
puppet.manifest_file = "site.pp"

13
development/shell-provisioning/install-puppet
View file

@ -1,13 +0,0 @@
#!/bin/bash
set -e
if `which puppet > /dev/null`; then
exit 0
fi
echo 'An old kernel was found on the guest machine and it will be upgraded' 1>&2
echo 'Please reload the box after provisioning when finished' 1>&2
sudo apt-get update
sudo apt-get install puppet -y

12
example/Vagrantfile vendored
View file

@ -15,7 +15,7 @@ Vagrant.require_plugin 'vagrant-lxc'
Vagrant.configure("2") do |config|
config.vm.box = "quantal64"
config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-08.box'
config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-10.box'
config.vm.hostname = 'lxc-quantal64'
config.vm.synced_folder "/tmp", "/vagrant_data"
@ -30,16 +30,6 @@ Vagrant.configure("2") do |config|
config.vm.provision :shell, :inline => <<-SCRIPT
echo "Hi there I'm a shell script used for provisioning"
if `which puppet > /dev/null`; then
echo "Looks like puppet has already been installed, moving on"
exit 0
fi
echo "I'm about to install puppet!"
sleep 1
echo "Hang tight, I just need to wait for a while since vagrant-lxc is not handling network properly ;)"
sleep 5
sudo apt-get update
sudo apt-get install puppet -y
SCRIPT
config.vm.provision :puppet do |puppet|