diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 6648202..8092681 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -1,7 +1,7 @@
 - id: manila-start
   type: puppet
-  role: [primary-controller, controller]
-  version: 2.0.0
+  groups: [primary-controller, controller]
+  version: 2.1.0
   cross-depends:
     - name: deploy_start
   cross-depended-by:
@@ -13,8 +13,8 @@
 
 - id: manila-hiera
   type: puppet
-  role: [primary-controller, controller]
-  version: 2.0.0
+  groups: [primary-controller, controller]
+  version: 2.1.0
   cross-depends:
     - name: manila-start
   cross-depended-by:
@@ -26,8 +26,8 @@
 
 - id: manila-keystone
   type: puppet
-  role: [primary-controller, controller]
-  version: 2.0.0
+  groups: [primary-controller, controller]
+  version: 2.1.0
   cross-depends:
     - name: manila-hiera
   cross-depended-by:
@@ -37,3 +37,15 @@
     puppet_modules: "."
     timeout: 3600
     
+- id: manila-main
+  type: puppet
+  groups: [primary-controller, controller]
+  version: 2.1.0
+  cross-depends:
+    - name: manila-kestone
+  cross-depended-by:
+    - name: deploy_end
+  parameters:
+    puppet_manifest: "puppet/manifests/install.pp"
+    puppet_modules: "."
+    timeout: 3600
diff --git a/docs/check-list.org b/docs/check-list.org
index 2d51e13..a2a7fd1 100644
--- a/docs/check-list.org
+++ b/docs/check-list.org
@@ -24,9 +24,10 @@ Steps for installation and configuration of the manila:
     --adminurl http://$adminurl:8786/v2/%\(tenant_id\)s \
     sharev2
 ** TODO install manila
+** TODO make /var/log and init files
 ** TODO edit config
 ** TODO do db staff
 ** TODO iptables
 * Notest
 ** Receive the puppet-manila module when the plugin is bulded
-** How to generate password in puppet?
+** DONE How to generate password in puppet?
diff --git a/pre_build_hook b/pre_build_hook
index a8b41ce..c836033 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -8,7 +8,7 @@ curdir=$(pwd)
 tmpdir=$(mktemp -d); cd $tmpdir
 
 git clone --depth 1 -b stable/mitaka https://github.com/openstack/manila.git
-fpm -s python -t deb manila/setup.py
+fpm -s python -t deb --python-install-bin /usr/bin  --python-install-lib /usr/lib/python2.7/dist-packages/ manila/setup.py
 
 git clone --depth 1 -b stable/mitaka https://github.com/openstack/python-manilaclient.git
 fpm -s python -t deb python-manilaclient/setup.py