Fix gnocchi installation for Newton

- Remove hardcoded old package version, always upgrade to latest
  version instead
- Install python-gnocchiclient needed by ceilometer in order to access
  the gnocchi backend

Change-Id: I6f6af90d3107df86bd0abbaacfca0836f7771cfe
This commit is contained in:
Jens Rosenboom 2017-02-15 11:17:08 +01:00
parent e5a08068c8
commit 73fa9aa276
3 changed files with 4 additions and 4 deletions

View File

@ -108,7 +108,7 @@ when 'rhel'
when 'debian'
default['openstack']['telemetry']['platform'] = {
'common_packages' => ['ceilometer-common'],
'gnocchi_packages' => ['python-gnocchi', 'gnocchi-common', 'gnocchi-api', 'gnocchi-metricd'],
'gnocchi_packages' => ['python-gnocchi', 'gnocchi-common', 'gnocchi-api', 'gnocchi-metricd', 'python-gnocchiclient'],
'gnocchi-api_service' => 'gnocchi-api',
'gnocchi-metricd_service' => 'gnocchi-metricd',
'agent_central_packages' => ['ceilometer-agent-central'],

View File

@ -22,7 +22,7 @@ platform = node['openstack']['telemetry']['platform']
platform['gnocchi_packages'].each do |pkg|
package pkg do
options platform['package_overrides']
version '2.0.2-4'
action :upgrade
end
end
# stop and disable the service gnocchi-api_service itself, since it should be run inside

View File

@ -11,7 +11,7 @@ describe 'openstack-telemetry::gnocchi_install' do
include_context 'telemetry-stubs'
it do
expect(chef_run).to install_package 'gnocchi-api'
expect(chef_run).to upgrade_package 'gnocchi-api'
end
it do
@ -20,7 +20,7 @@ describe 'openstack-telemetry::gnocchi_install' do
end
it do
expect(chef_run).to install_package 'gnocchi-metricd'
expect(chef_run).to upgrade_package 'gnocchi-metricd'
end
end
end