diff --git a/attributes/default.rb b/attributes/default.rb index 63a26a1..91c8d2a 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -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'], diff --git a/recipes/gnocchi_install.rb b/recipes/gnocchi_install.rb index e0e412a..6eb7ba3 100644 --- a/recipes/gnocchi_install.rb +++ b/recipes/gnocchi_install.rb @@ -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 diff --git a/spec/gnocchi_install_spec.rb b/spec/gnocchi_install_spec.rb index bf11113..1f032b8 100644 --- a/spec/gnocchi_install_spec.rb +++ b/spec/gnocchi_install_spec.rb @@ -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