use latest manilaclient from pip

Change-Id: I6031a2f029600a4c222bcc464e9d667ed173ec44
This commit is contained in:
Igor Gajsin 2016-10-06 19:29:34 +03:00
parent 60b32f2d7d
commit 8038e59613
2 changed files with 6 additions and 13 deletions

View File

@ -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']

View File

@ -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 \