openstack
/
cookbook-openstack-network
Code Issues Proposed changes

Merge "Use python3 packages on Ubuntu"

This commit is contained in:
Zuul 2019-11-25 15:19:32 +00:00 committed by Gerrit Code Review
parent 5a3848fba2 46b89f7714
commit da7196356f
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
attributes/default.rb
View File

@ -182,8 +182,8 @@ default['openstack']['network']['platform'].tap do |platform|
'neutron-metering-agent'
platform['neutron_server_service'] =
'neutron-server'
platform['neutron_lbaas_python_dependencies'] =
%w(python-neutron-lbaas)
platform['neutron_rpc_server_service'] =
'neutron-rpc-server'
case node['platform_family']
when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
platform['neutron_packages'] =
@ -198,6 +198,8 @@ default['openstack']['network']['platform'].tap do |platform|
%w()
platform['neutron_lbaas_packages'] =
%w(openstack-neutron-lbaas haproxy iproute)
platform['neutron_lbaas_python_dependencies'] =
%w(python-neutron-lbaas)
platform['neutron_openvswitch_packages'] =
%w(openvswitch)
platform['neutron_openvswitch_agent_packages'] =
@ -220,15 +222,17 @@ default['openstack']['network']['platform'].tap do |platform|
''
when 'debian'
platform['neutron_packages'] =
%w(neutron-common)
%w(neutron-common python3-neutron)
platform['neutron_dhcp_packages'] =
%w(neutron-dhcp-agent)
platform['neutron_l3_packages'] =
%w(neutron-l3-agent radvd keepalived)
%w(python3-neutron-fwaas neutron-l3-agent radvd keepalived)
platform['neutron_fwaas_packages'] =
%w(python-neutron-fwaas)
%w(python3-neutron-fwaas)
platform['neutron_lbaas_packages'] =
%w(python-neutron-lbaas neutron-lbaas-common neutron-lbaasv2-agent haproxy)
%w(python3-neutron-lbaas neutron-lbaas-common neutron-lbaasv2-agent haproxy)
platform['neutron_lbaas_python_dependencies'] =
%w(python3-neutron-lbaas)
platform['neutron_openvswitch_packages'] =
%w(openvswitch-switch bridge-utils)
platform['neutron_openvswitch_build_packages'] =

2
spec/default_spec.rb
View File

@ -11,7 +11,7 @@ describe 'openstack-network' do
include_context 'neutron-stubs'
%w(neutron-common python-mysqldb).each do |package|
%w(neutron-common python3-mysqldb).each do |package|
it do
expect(chef_run).to upgrade_package(package)
end

2
spec/lbaas_spec.rb
View File

@ -12,7 +12,7 @@ describe 'openstack-network::lbaas' do
include_context 'neutron-stubs'
it do
%w(python-neutron-lbaas neutron-lbaasv2-agent haproxy)
%w(python3-neutron-lbaas neutron-lbaasv2-agent haproxy)
.each do |pkg|
expect(chef_run).to upgrade_package(pkg)
end