openstack
/
cookbook-openstack-telemetry
Code Issues Proposed changes

Use python3 packages on Ubuntu 

Python2.7 is going EOL soon, let us deploy python3 for Rocky from the
start, so we avoid having to switch later.

Change-Id: I52b2431da20b4ac994d920c233e6473ce275b197
This commit is contained in:
Lance Albertson 2019-11-25 16:28:31 -08:00
parent 2e36b048fc
commit 3923f6ff5c
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
attributes/default.rb
View File

@ -152,8 +152,8 @@ when 'rhel'
when 'debian'
default['openstack']['telemetry']['platform'] = {
'common_packages' => ['ceilometer-common'],
'gnocchi_packages' => ['python-gnocchi', 'gnocchi-common', 'gnocchi-api', 'gnocchi-metricd', 'python-gnocchiclient'],
'common_packages' => ['ceilometer-common', 'python3-ceilometer'],
'gnocchi_packages' => ['python3-gnocchi', 'gnocchi-common', 'gnocchi-api', 'gnocchi-metricd', 'python3-gnocchiclient'],
'gnocchi-api_service' => 'gnocchi-api',
'gnocchi-metricd_service' => 'gnocchi-metricd',
'agent_central_packages' => ['ceilometer-agent-central'],
@ -162,15 +162,15 @@ when 'debian'
'agent_compute_service' => 'ceilometer-agent-compute',
'agent_notification_packages' => ['ceilometer-agent-notification'],
'agent_notification_service' => 'ceilometer-agent-notification',
'ceilometer-api_wsgi_file' => '/usr/lib/python2.7/dist-packages/ceilometer/api/app.wsgi',
'gnocchi-api_wsgi_file' => '/usr/lib/python2.7/dist-packages/gnocchi/rest/wsgi.py',
'collector_packages' => ['ceilometer-collector', 'python-mysqldb'],
'ceilometer-api_wsgi_file' => '/usr/lib/python3/dist-packages/ceilometer/api/app.wsgi',
'gnocchi-api_wsgi_file' => '/usr/lib/python3/dist-packages/gnocchi/rest/wsgi.py',
'collector_packages' => ['ceilometer-collector', 'python3-mysqldb'],
'collector_service' => 'ceilometer-collector',
'package_overrides' => '',
}
default['openstack']['aodh']['platform'] = {
'aodh_packages' => ['aodh-api', 'aodh-evaluator', 'aodh-expirer', 'aodh-listener', 'aodh-notifier', 'python-ceilometerclient'],
'aodh_packages' => ['aodh-api', 'aodh-evaluator', 'aodh-expirer', 'aodh-listener', 'aodh-notifier', 'python3-ceilometerclient'],
'aodh_services' => ['aodh-evaluator', 'aodh-notifier', 'aodh-listener'],
'aodh-api_wsgi_file' => '/usr/share/aodh/app.wsgi' # this file come with aodh-common which aodh-api depends on
}

2
spec/collector_spec.rb
View File

@ -16,7 +16,7 @@ describe 'openstack-telemetry::collector' do
end
it do
expect(chef_run).to upgrade_package('python-mysqldb')
expect(chef_run).to upgrade_package('python3-mysqldb')
end
it do

3
spec/common_spec.rb
View File

@ -21,11 +21,12 @@ describe 'openstack-telemetry::common' do
end
it 'installs mysql python packages by default' do
expect(chef_run).to upgrade_package 'python-mysqldb'
expect(chef_run).to upgrade_package 'python3-mysqldb'
end
it 'installs the common package' do
expect(chef_run).to upgrade_package 'ceilometer-common'
expect(chef_run).to upgrade_package 'python3-ceilometer'
end
describe '/etc/ceilometer/pipeline.yaml' do

6
spec/gnocchi_install_spec.rb
View File

@ -10,8 +10,10 @@ describe 'openstack-telemetry::gnocchi_install' do
include_context 'telemetry-stubs'
it do
expect(chef_run).to upgrade_package 'gnocchi-api'
%w(python3-gnocchi gnocchi-common gnocchi-api gnocchi-metricd python3-gnocchiclient).each do |p|
it do
expect(chef_run).to upgrade_package p
end
end
it do