openstack
/
cookbook-openstack-network
Code Issues Proposed changes

Use correct packages on Ubuntu for linuxbridge 

Change-Id: I20a3ab5c51e1d984a4d87e2333d26d504f0f711d
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2021-07-16 16:41:07 -07:00
parent d05c095378
commit beddfe196b
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
attributes/default.rb
View File

@ -195,8 +195,8 @@ default['openstack']['network']['platform'].tap do |platform|
python-zopeinterface
)
platform['neutron_openvswitch_agent_packages'] = %w(neutron-openvswitch-agent)
platform['neutron_linuxbridge_agent_packages'] = %w(neutron-plugin-linuxbridge neutron-plugin-linuxbridge-agent)
platform['neutron_linuxbridge_agent_service'] = 'neutron-plugin-linuxbridge-agent'
platform['neutron_linuxbridge_agent_packages'] = %w(neutron-linuxbridge-agent)
platform['neutron_linuxbridge_agent_service'] = 'neutron-linuxbridge-agent'
platform['neutron_metadata_agent_packages'] = %w(neutron-metadata-agent)
platform['neutron_metering_agent_packages'] = %w(neutron-metering-agent)
platform['neutron_server_packages'] = %w(neutron-server)

10
spec/ml2_linuxbridge_spec.rb
View File

@ -44,19 +44,13 @@ describe 'openstack-network::ml2_linuxbridge' do
end
end
pkgs =
%w(
neutron-plugin-linuxbridge
neutron-plugin-linuxbridge-agent
)
it do
expect(chef_run).to upgrade_package(pkgs)
expect(chef_run).to upgrade_package 'neutron-linuxbridge-agent'
end
it do
expect(chef_run).to enable_service('neutron-plugin-linuxbridge-agent').with(
service_name: 'neutron-plugin-linuxbridge-agent',
service_name: 'neutron-linuxbridge-agent',
supports: {
status: true,
restart: true,