diff --git a/.gitmodules b/.gitmodules
index b75069b..e0c9d14 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,30 @@
 [submodule "modules/create_resources"]
 	path = modules/create_resources
 	url = git://github.com/puppetlabs/puppetlabs-create_resources.git
+[submodule "modules/concat"]
+	path = modules/concat
+	url = git://github.com/puppetlabs/puppet-concat
+[submodule "modules/keystone"]
+	path = modules/keystone
+	url = git://github.com/puppetlabs/puppetlabs-keystone
+[submodule "modules/rsync"]
+	path = modules/rsync
+	url = git://github.com/puppetlabs/puppet-rsync
+[submodule "modules/ssh"]
+	path = modules/ssh
+	url = git://github.com/saz/puppet-ssh
+[submodule "modules/memcached"]
+	path = modules/memcached
+	url = git://github.com/saz/puppet-memcached
+[submodule "modules/xinetd"]
+	path = modules/xinetd
+	url = git://github.com/ghoneycutt/xinetd
+[submodule "modules/swift"]
+	path = modules/swift
+	url = git://github.com/puppetlabs/puppetlabs-swft
+[submodule "puppetlabs-keystone"]
+	path = puppetlabs-keystone
+	url = git://github.com/puppetlabs/puppetlabs-keystone
+[submodule "modules/vcsrepo"]
+	path = modules/vcsrepo
+	url = git://github.com/puppetlabs/puppet-vcsrepo
diff --git a/modules/openstack/manifests/repo/diablo.pp b/modules/openstack/manifests/repo/diablo.pp
deleted file mode 100644
index 3a5a73f..0000000
--- a/modules/openstack/manifests/repo/diablo.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class openstack::repo::diablo {
-  apt::ppa { 'ppa:openstack-release/2011.3': }
-}
diff --git a/modules/vcsrepo b/modules/vcsrepo
new file mode 160000
index 0000000..462b1d6
--- /dev/null
+++ b/modules/vcsrepo
@@ -0,0 +1 @@
+Subproject commit 462b1d69bbc5d6c171dcee02a3d88d304acd630e