Remove unnecessary nesting in vagrant directory.

This isn't needed anymore because of:
https://github.com/pradels/vagrant-libvirt/commit/0ac7498f4d73d4100462ac34b5cd89c308622fc5

Let me know if I broke anything or if this still works perfectly!

18 files changed, 18 insertions, 18 deletions

diff --git a/.gitmodules b/.gitmodules
index 4e6d704..bc295c2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,24 +1,24 @@
-[submodule "vagrant/gluster/puppet/modules/stdlib"]
-	path = vagrant/gluster/puppet/modules/stdlib
+[submodule "vagrant/puppet/modules/stdlib"]
+	path = vagrant/puppet/modules/stdlib
 	url = https://github.com/purpleidea/puppetlabs-stdlib.git
-[submodule "vagrant/gluster/puppet/modules/apt"]
-	path = vagrant/gluster/puppet/modules/apt
+[submodule "vagrant/puppet/modules/apt"]
+	path = vagrant/puppet/modules/apt
 	url = https://github.com/purpleidea/puppetlabs-apt.git
-[submodule "vagrant/gluster/puppet/modules/common"]
-	path = vagrant/gluster/puppet/modules/common
+[submodule "vagrant/puppet/modules/common"]
+	path = vagrant/puppet/modules/common
 	url = https://github.com/purpleidea/puppet-common.git
-[submodule "vagrant/gluster/puppet/modules/keepalived"]
-	path = vagrant/gluster/puppet/modules/keepalived
+[submodule "vagrant/puppet/modules/keepalived"]
+	path = vagrant/puppet/modules/keepalived
 	url = https://github.com/purpleidea/puppet-keepalived.git
-[submodule "vagrant/gluster/puppet/modules/puppet"]
-	path = vagrant/gluster/puppet/modules/puppet
+[submodule "vagrant/puppet/modules/puppet"]
+	path = vagrant/puppet/modules/puppet
 	url = https://github.com/purpleidea/puppet-puppet.git
-[submodule "vagrant/gluster/puppet/modules/shorewall"]
-	path = vagrant/gluster/puppet/modules/shorewall
+[submodule "vagrant/puppet/modules/shorewall"]
+	path = vagrant/puppet/modules/shorewall
 	url = https://github.com/purpleidea/puppet-shorewall.git
-[submodule "vagrant/gluster/puppet/modules/yum"]
-	path = vagrant/gluster/puppet/modules/yum
+[submodule "vagrant/puppet/modules/yum"]
+	path = vagrant/puppet/modules/yum
 	url = https://github.com/purpleidea/puppet-yum.git
-[submodule "vagrant/gluster/puppet/modules/module-data"]
-	path = vagrant/gluster/puppet/modules/module-data
+[submodule "vagrant/puppet/modules/module-data"]
+	path = vagrant/puppet/modules/module-data
 	url = https://github.com/purpleidea/puppet-module-data.git
diff --git a/vagrant/gluster/.gitignore b/vagrant/.gitignore
index 3883822..3883822 100644
--- a/vagrant/gluster/.gitignore
+++ b/vagrant/.gitignore
diff --git a/vagrant/gluster/Vagrantfile b/vagrant/Vagrantfile
index 6f65ec9..44b36a0 100644
--- a/vagrant/gluster/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -582,7 +582,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 		libvirt.username = 'root'
 		libvirt.storage_pool_name = 'default'
 		#libvirt.default_network = 'default'	# XXX: this does nothing
-		#libvirt.default_prefix = ''	# set a prefix for your vm's...
+		libvirt.default_prefix = 'gluster'	# prefix for your vm's!
 	end
 
 end
diff --git a/vagrant/gluster/puppet/files/README b/vagrant/puppet/files/README
index 3f5a63a..3f5a63a 100644
--- a/vagrant/gluster/puppet/files/README
+++ b/vagrant/puppet/files/README
diff --git a/vagrant/gluster/puppet/hiera.yaml b/vagrant/puppet/hiera.yaml
index 5aaf25d..5aaf25d 100644
--- a/vagrant/gluster/puppet/hiera.yaml
+++ b/vagrant/puppet/hiera.yaml
diff --git a/vagrant/gluster/puppet/hieradata/common.yaml b/vagrant/puppet/hieradata/common.yaml
index d0fa005..d0fa005 100644
--- a/vagrant/gluster/puppet/hieradata/common.yaml
+++ b/vagrant/puppet/hieradata/common.yaml
diff --git a/vagrant/gluster/puppet/manifests/site.pp b/vagrant/puppet/manifests/site.pp
index 426099d..426099d 100644
--- a/vagrant/gluster/puppet/manifests/site.pp
+++ b/vagrant/puppet/manifests/site.pp
diff --git a/vagrant/gluster/puppet/modules/.gitignore b/vagrant/puppet/modules/.gitignore
index 8a495bf..8a495bf 100644
--- a/vagrant/gluster/puppet/modules/.gitignore
+++ b/vagrant/puppet/modules/.gitignore
diff --git a/vagrant/gluster/puppet/modules/Makefile b/vagrant/puppet/modules/Makefile
index 125051b..c650773 100644
--- a/vagrant/gluster/puppet/modules/Makefile
+++ b/vagrant/puppet/modules/Makefile
@@ -62,6 +62,6 @@ gluster:
 	basename `pwd` | grep -q '^modules' || exit 1	# run in a modules dir!
 	i='puppet-gluster'; \
 	j=`echo $$i | awk -F '-' '{print $$2}'`; \
-	[ -d "$$j" ] || git clone ../../../../. $$j; \
+	[ -d "$$j" ] || git clone ../../../. $$j; \
 	[ -d "$$j" ] && cd $$j && git checkout master && git pull && git checkout $(SHA1SUM); cd ..
 
diff --git a/vagrant/gluster/puppet/modules/README b/vagrant/puppet/modules/README
index c1837a5..c1837a5 100644
--- a/vagrant/gluster/puppet/modules/README
+++ b/vagrant/puppet/modules/README
diff --git a/vagrant/gluster/puppet/modules/apt b/vagrant/puppet/modules/apt
-Subproject 5b54eda3668a42b12e21696e500b40a27005bf2
+Subproject 5b54eda3668a42b12e21696e500b40a27005bf2
diff --git a/vagrant/gluster/puppet/modules/common b/vagrant/puppet/modules/common
-Subproject 2c0ed2844c606fd806bde0c02e47e79c88fab4a
+Subproject 2c0ed2844c606fd806bde0c02e47e79c88fab4a
diff --git a/vagrant/gluster/puppet/modules/keepalived b/vagrant/puppet/modules/keepalived
-Subproject f0585c45e7c5d5c2d86d0a84690a75dc522b2cd
+Subproject f0585c45e7c5d5c2d86d0a84690a75dc522b2cd
diff --git a/vagrant/gluster/puppet/modules/module-data b/vagrant/puppet/modules/module-data
-Subproject 4b3ad1cc239d7831616e69796184e400de0f5fe
+Subproject 4b3ad1cc239d7831616e69796184e400de0f5fe
diff --git a/vagrant/gluster/puppet/modules/puppet b/vagrant/puppet/modules/puppet
-Subproject f139d0b7cfe6d55c0848d0d338e19fe640a961f
+Subproject f139d0b7cfe6d55c0848d0d338e19fe640a961f
diff --git a/vagrant/gluster/puppet/modules/shorewall b/vagrant/puppet/modules/shorewall
-Subproject fbc7c6576092ceaf81b837989e086cb7fcc071d
+Subproject fbc7c6576092ceaf81b837989e086cb7fcc071d
diff --git a/vagrant/gluster/puppet/modules/stdlib b/vagrant/puppet/modules/stdlib
-Subproject 44c181ec0e230768b8dce10de57f9b32638e66e
+Subproject 44c181ec0e230768b8dce10de57f9b32638e66e
diff --git a/vagrant/gluster/puppet/modules/yum b/vagrant/puppet/modules/yum
-Subproject d098f6de9a38055b3482325d371722835b57697
+Subproject d098f6de9a38055b3482325d371722835b57697