From 8038e5961374a63fab1cd1f8c239d45b388e1725 Mon Sep 17 00:00:00 2001
From: Igor Gajsin <igajsin@mirantis.com>
Date: Thu, 6 Oct 2016 19:29:34 +0300
Subject: [PATCH] use latest manilaclient from pip

Change-Id: I6031a2f029600a4c222bcc464e9d667ed173ec44
---
 deployment_scripts/puppet/manifests/install.pp    | 15 ++++-----------
 .../puppet/modules/manila_auxiliary/files/meta.sh |  4 ++--
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/deployment_scripts/puppet/manifests/install.pp b/deployment_scripts/puppet/manifests/install.pp
index acb2548..25836bf 100644
--- a/deployment_scripts/puppet/manifests/install.pp
+++ b/deployment_scripts/puppet/manifests/install.pp
@@ -1,10 +1,5 @@
 notify {'MODULAR: fuel-plugin-manila/install': }
 
-$master_ip             = hiera('master_ip')
-$manilaclient_pkg_name = 'fuel-plugin-manila-manilaclient'
-$manilaclient_pkg      = "${manilaclient_pkg_name}_1.8.2_all.deb"
-$manilaclient_pkg_url  = "http://${master_ip}:8080/plugins/fuel-plugin-manila-1.0/repositories/ubuntu/${manilaclient_pkg}"
-
 package {'python-pip':
   ensure => 'installed'
 }
@@ -21,13 +16,11 @@ package {'pycrypto':
   provider => 'pip',
 }
 
-exec { 'install_manilaclient':
-  path    => '/usr/sbin:/usr/bin:/sbin:/bin:',
-  command => "wget ${manilaclient_pkg_url} -O /tmp/${manilaclient_pkg} && dpkg --force-overwrite -i /tmp/${manilaclient_pkg}",
-  onlyif  => "echo \"! dpkg -l ${manilaclient_pkg_name}\" | bash",
+package {'python-manilaclient':
+  ensure   => '1.11.90',
+  provider => 'pip',
 }
 
-
 package {'python-manila':
   ensure => 'absent'
 }
@@ -58,10 +51,10 @@ Package['python-pip']->
 Package['python-dev']->
 Package['python-pymysql']->
 Package['pycrypto']->
+Package['python-manilaclient']->
 Package['python-manila']->
 Package['manila-api']->
 Package['manila-common']->
 Package['manila-scheduler']->
 Package['fuel-plugin-manila-manila-core']->
-Exec['install_manilaclient']->
 Package['fuel-plugin-manila-manila-ui']
diff --git a/deployment_scripts/puppet/modules/manila_auxiliary/files/meta.sh b/deployment_scripts/puppet/modules/manila_auxiliary/files/meta.sh
index 90fbbd0..07af2e3 100755
--- a/deployment_scripts/puppet/modules/manila_auxiliary/files/meta.sh
+++ b/deployment_scripts/puppet/modules/manila_auxiliary/files/meta.sh
@@ -2,9 +2,9 @@
 
 . /root/openrc
 
-if ! openstack flavor list | grep -q 'manila-service-flavor'; then
+if ! openstack --insecure flavor list | grep -q 'manila-service-flavor'; then
     echo 'add manila-service-flavor'
-    openstack flavor create manila-service-flavor \
+    openstack --insecure flavor create manila-service-flavor \
       --id 100  \
       --ram 256 \
       --disk 0  \