diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..9014735
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "deployment_scripts/puppet/modules/puppet-manila"]
+	path = deployment_scripts/puppet/modules/puppet-manila
+	url = https://github.com/openstack/puppet-manila.git
+	branch = stable/mitaka
diff --git a/deployment_scripts/puppet/modules/puppet-manila b/deployment_scripts/puppet/modules/puppet-manila
new file mode 160000
index 0000000..3d8244d
--- /dev/null
+++ b/deployment_scripts/puppet/modules/puppet-manila
@@ -0,0 +1 @@
+Subproject commit 3d8244db11cb603f89980b8fbefc5dc228f0a7d8