rename the manila packages

The plugin build it's own packages for manila instead stored in the
ubuntu repositories. For avoiding confusing between them plugin's
packages were renaimed.

Change-Id: Iba2add1e01a7f5677bf7793e12c97ce3d3fb8ac1

deployment_scripts/puppet/manifests/install.pp

@@ -16,35 +16,49 @@ package {'pycrypto':
   provider => 'pip',
 }
 
-package {'python-manila':
-  ensure => 'installed'
-}
-
 package {'python-manilaclient':
+  ensure => 'absent'
+}
+
+package {'python-manila':
+  ensure => 'absent'
+}
+
+package {'manila-api':
+  ensure => 'absent'
+}
+
+package {'manila-common':
+  ensure => 'absent'
+}
+
+package {'manila-scheduler':
+  ensure => 'absent'
+}
+
+package {'fuel-plugin-manila-manila-core':
   ensure => 'installed'
 }
 
-package {'python-manila-ui':
+package {'fuel-plugin-manila-manilaclient':
+  ensure => 'installed'
+}
+
+package {'fuel-plugin-manila-manila-ui':
   ensure => 'installed'
 }
 
 class {'::manila_auxiliary::fs': }
 
-file {'/etc/apt/preferences.d/fuel-plugin-manila.pref':
-  source => 'puppet:///modules/manila_auxiliary/fuel-plugin-manila.pref',
-  owner  => 'root',
-  group  => 'root'
-}
-
-class {'::apt::update': }
-
-
 Package['python-pip']->
 Package['python-dev']->
 Package['python-pymysql']->
 Package['pycrypto']->
-File['/etc/apt/preferences.d/fuel-plugin-manila.pref']->
-Class['::apt::update']->
-Package['python-manila']->
 Package['python-manilaclient']->
-Package['python-manila-ui']
+Package['python-manila']->
+Package['manila-api']->
+Package['manila-common']->
+Package['manila-scheduler']->
+Package['fuel-plugin-manila-manila-core']->
+Package['fuel-plugin-manila-manilaclient']->
+Package['fuel-plugin-manila-manila-ui']

deployment_scripts/puppet/modules/manila_auxiliary/files/fuel-plugin-manila.pref

@@ -1,5 +0,0 @@
-# This file is managed by Puppet. DO NOT EDIT.
-Explanation: fuel-plugin-manila
-Package: *
-Pin: release a=fuel-plugin-manila, n=fuel-plugin-manila, o=Mirantis, l=fuel-plugin-manila
-Pin-Priority: 1250

pre_build_hook

@@ -3,18 +3,22 @@
 git submodule update
 
 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
+    version=$1
+    src=$2
+    name=$3
+    fpm -v $version -s python -t deb -n $name --python-install-bin /usr/bin --python-install-lib /usr/lib/python2.7/dist-packages/ $src/setup.py
 }
 
 
 rm repositories/ubuntu/*
 cd repositories/python
 
-build_deb "1:2.0.1" manila
+build_deb "1:2.0.1" manila fuel-plugin-manila-manila-core
 
 sed -i s/'python-keystoneclient'/'#python-keystoneclient'/ manila-ui/requirements.txt
+sed -i s/'python-manilaclient'/'#python-manilaclient'/ manila-ui/requirements.txt
 sed -i s/'disabled_quotas.extend(_get_manila_disabled_quotas(request))'/'disabled_quotas.update(_get_manila_disabled_quotas(request))'/ manila-ui/manila_ui/dashboards/project/shares/__init__.py
-build_deb 2.1.1 manila-ui
+build_deb 2.1.1 manila-ui fuel-plugin-manila-manila-ui
 cd manila-ui; git checkout stable/mitaka;
 git checkout -- requirements.txt;
 git checkout -- manila_ui/dashboards/project/shares/__init__.py
@@ -22,7 +26,7 @@ cd ..
 
 sed -i s/'python-keystoneclient'/'#python-keystoneclient'/ python-manilaclient/requirements.txt
 sed -i s/'pycrypto'/'#pycrypto'/ python-manilaclient/requirements.txt
-build_deb 1.8.2 python-manilaclient
+build_deb 1.8.2 python-manilaclient fuel-plugin-manila-manilaclient
 cd python-manilaclient; git checkout -- requirements.txt; cd ..
 
 mv *.deb ../ubuntu