From 431f716381a6be6d7bd092acc2b33540ea6b766b Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 27 Jan 2014 16:04:31 -0200
Subject: Vagrant compatibility

---
 Vagrantfile          | 15 +++++++++++++++
 manifests/vagrant.pp |  5 +++++
 misc/mrconfig.sh     | 27 +++++++++++++++++++++++++++
 mrconfig.sh          | 27 ---------------------------
 puppet               |  1 +
 5 files changed, 48 insertions(+), 27 deletions(-)
 create mode 100644 Vagrantfile
 create mode 100644 manifests/vagrant.pp
 create mode 100755 misc/mrconfig.sh
 delete mode 100755 mrconfig.sh
 create mode 120000 puppet

diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000..ecf1c91
--- /dev/null
+++ b/Vagrantfile
@@ -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
index 0000000..61bbc28
--- /dev/null
+++ b/manifests/vagrant.pp
@@ -0,0 +1,5 @@
+# Import main module
+import "nodo"
+
+# Vagrant classes
+include nodo::role::vagrant
diff --git a/misc/mrconfig.sh b/misc/mrconfig.sh
new file mode 100755
index 0000000..043ea74
--- /dev/null
+++ b/misc/mrconfig.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+#
+# Build a mrconfig for the needed modules.
+# 
+
+# Parameters
+GIT="git.sarava.org"
+URL="https://$GIT/?a=project_index"
+CWD="`pwd`"
+WORK="`dirname $0`/.."
+
+# Create a new config
+cd $WORK
+rm -f .mrconfig
+touch .mrconfig
+
+# Fetch repository list and updtate mrconfig
+curl --stderr - $URL | grep "^puppet-" | while read module; do
+  folder="`echo $module | sed -e 's/^puppet-//'`"
+  folder="`basename $folder .git`"
+  
+  echo "Processing $folder..."
+  mr config puppet/modules/$folder checkout="git clone git://$GIT/$module $folder"
+done
+
+# Teardown
+cd $CWD
diff --git a/mrconfig.sh b/mrconfig.sh
deleted file mode 100755
index 3ea3646..0000000
--- a/mrconfig.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-# Build a mrconfig for the needed modules.
-# 
-
-# Parameters
-GIT="git.sarava.org"
-URL="https://$GIT/?a=project_index"
-CWD="`pwd`"
-WORK="`dirname $0`"
-
-# Create a new config
-cd $WORK
-rm -f .mrconfig
-touch .mrconfig
-
-# Fetch repository list and updtate mrconfig
-curl --stderr - $URL | grep "^puppet-" | while read module; do
-  folder="`echo $module | sed -e 's/^puppet-//'`"
-  folder="`basename $folder .git`"
-  
-  echo "Processing $folder..."
-  mr config puppet/modules/$folder checkout="git clone git://$GIT/$module $folder"
-done
-
-# Teardown
-cd $CWD
diff --git a/puppet b/puppet
new file mode 120000
index 0000000..945c9b4
--- /dev/null
+++ b/puppet
@@ -0,0 +1 @@
+.
\ No newline at end of file
-- 
cgit v1.2.3