]> gitweb.fluxo.info Git - puppet-bootstrap.git/commitdiff
Vagrant compatibility
authorSilvio Rhatto <rhatto@riseup.net>
Mon, 27 Jan 2014 18:04:31 +0000 (16:04 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Mon, 27 Jan 2014 18:04:31 +0000 (16:04 -0200)
Vagrantfile [new file with mode: 0644]
manifests/vagrant.pp [new file with mode: 0644]
misc/mrconfig.sh [moved from mrconfig.sh with 95% similarity]
puppet [new symlink]

diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644 (file)
index 0000000..ecf1c91
--- /dev/null
@@ -0,0 +1,15 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant::Config.run do |config|
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "wheezy"
+
+  # Enable provisioning with Puppet stand alone.
+  config.vm.provision :puppet do |puppet|
+    puppet.manifest_file  = "vagrant.pp"
+    puppet.manifests_path = "puppet/manifests"
+    puppet.module_path    = "puppet/modules"
+    puppet.pp_path        = "/etc/puppet"
+  end
+end
diff --git a/manifests/vagrant.pp b/manifests/vagrant.pp
new file mode 100644 (file)
index 0000000..61bbc28
--- /dev/null
@@ -0,0 +1,5 @@
+# Import main module
+import "nodo"
+
+# Vagrant classes
+include nodo::role::vagrant
similarity index 95%
rename from mrconfig.sh
rename to misc/mrconfig.sh
index 3ea364626a17f697eb2f3af8e01ffb9974d52a9f..043ea74563adfdfc08c2184e4abff05f596c4164 100755 (executable)
@@ -7,7 +7,7 @@
 GIT="git.sarava.org"
 URL="https://$GIT/?a=project_index"
 CWD="`pwd`"
-WORK="`dirname $0`"
+WORK="`dirname $0`/.."
 
 # Create a new config
 cd $WORK
diff --git a/puppet b/puppet
new file mode 120000 (symlink)
index 0000000..945c9b4
--- /dev/null
+++ b/puppet
@@ -0,0 +1 @@
+.
\ No newline at end of file