install manila packages

Add manila projects as submodules and switch its to stable/mitaka.
Fix requirements to be compatible with ubuntu 14.04.
Change pre_build_hook to building deb packages from python source
code.

Change-Id: I3300c3f58d9df39ed452d64e60846fad20056fca

.gitmodules

@@ -2,3 +2,12 @@
 	path = deployment_scripts/puppet/modules/manila
 	url = https://github.com/openstack/puppet-manila.git
 	branch = stable/mitaka
+[submodule "repositories/python/manila-ui"]
+	path = repositories/python/manila-ui
+	url = https://github.com/openstack/manila-ui.git
+[submodule "repositories/python/python-manilaclient"]
+	path = repositories/python/python-manilaclient
+	url = https://github.com/openstack/python-manilaclient.git
+[submodule "repositories/python/manila"]
+	path = repositories/python/manila
+	url = https://github.com/openstack/manila.git

deployment_scripts/puppet/manifests/install.pp

@@ -0,0 +1,24 @@
+notify {'MODULAR: fuel-plugin-manila/install': }
+
+package {'python-pip':
+  ensure => 'installed'
+}
+
+package {'pycrypto':
+  ensure => 'installed',
+  provider => 'pip',
+}
+
+package {'python-manila':
+  ensure => 'installed'
+}
+
+package {'python-manilaclient':
+  ensure => 'installed'
+}
+
+package {'python-manila-ui':
+  ensure => 'installed'
+}
+
+Package['python-pip']->Package['pycrypto']->Package['python-manila']->Package['python-manilaclient']->Package['python-manila-ui']

deployment_tasks.yaml

@@ -59,6 +59,19 @@
     puppet_modules: "puppet/modules:/etc/puppet/modules"
     timeout: 3600
 
+- id: manila-install
+  type: puppet
+  groups: [primary-controller, controller]
+  version: 2.1.0
+  required_for: [manila-main]
+  requires: [manila-db]
+  parameters:
+    puppet_manifest: "puppet/manifests/install.pp"
+    puppet_modules: "puppet/modules:/etc/puppet/modules"
+    timeout: 3600
+
+
+
 - id: manila-main
   type: puppet
   groups: [primary-controller, controller]

metadata.yaml

@@ -3,7 +3,7 @@ name: fuel-plugin-manila
 # Human-readable name for your plugin
 title: Title for fuel-plugin-manila plugin
 # Plugin version
-version: '1.0.2'
+version: '1.0.5'
 # Description
 description: Please describe your plugin here
 # Required fuel version

pre_build_hook

@@ -3,19 +3,16 @@
 # update submodules for core puppet manifests
 git submodule update --remote deployment_scripts/puppet/modules/manila
 
-# build the deb for manila project
-curdir=$(pwd)
-tmpdir=$(mktemp -d); cd $tmpdir
+function build_deb {
+    fpm -v $1 -s python -t deb --python-install-bin /usr/bin --python-install-lib /usr/lib/python2.7/dist-packages/ $2/setup.py
+}
 
-git clone --depth 1 -b stable/mitaka https://github.com/openstack/manila.git
-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
+rm repositories/ubuntu/*
+cd repositories/python
 
-git clone --depth 1 -b stable/mitaka https://github.com/openstack/manila-ui.git
-fpm -s python -t deb manila-ui/setup.py
-
-cp *.deb $curdir/repositories/ubuntu
-cd .. ; rm -rf $tmpdir
+build_deb 2.1.1 manila-ui
+build_deb "1:2.0.1" manila
+build_deb 1.8.2 python-manilaclient
 
+mv *.deb ../ubuntu

repositories/python/manila

@@ -0,0 +1 @@
+Subproject commit 7fc23483a553f3d110a29308390af432b9479508

repositories/python/manila-ui

@@ -0,0 +1 @@
+Subproject commit d5f4110588bc7cb6d4f7a612f28a15d7d9a033ef

repositories/python/python-manilaclient

@@ -0,0 +1 @@
+Subproject commit d770bef5471024d4c41b02f9aa60935b9f511d95