openstack
/
cookbook-openstack-orchestration
Code Issues Proposed changes

Merge "Use python3 packages on Ubuntu"

This commit is contained in:
Zuul 2019-11-25 15:02:39 +00:00 committed by Gerrit Code Review
parent 1563e11db3 8dfd60f6ec
commit 2a91191afd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
attributes/default.rb
View File

@ -75,9 +75,9 @@ when 'debian'
default['openstack']['orchestration']['user'] = 'heat'
default['openstack']['orchestration']['group'] = 'heat'
default['openstack']['orchestration']['platform'] = {
'heat_common_packages' => ['heat-common', 'python-heat'],
'heat_common_packages' => ['heat-common', 'python3-heat'],
'heat_api_packages' => ['heat-api'],
'heat_dashboard_packages' => ['python-heat-dashboard'],
'heat_dashboard_packages' => ['python3-heat-dashboard'],
'heat_api_service' => 'heat-api',
'heat_api_cfn_packages' => ['heat-api-cfn'],
'heat_api_cfn_service' => 'heat-api-cfn',

4
spec/common_spec.rb
View File

@ -13,14 +13,14 @@ describe 'openstack-orchestration::common' do
include_examples 'expects to create heat conf'
include_examples 'expects to create heat default.yaml'
include_examples 'expect runs db migrations'
%w(heat-common python-heat).each do |p|
%w(heat-common python3-heat).each do |p|
it "installs the #{p} package" do
expect(chef_run).to upgrade_package p
end
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
end
end