openstack/puppet-neutron
Code Issues Proposed changes

Fix packages for the linuxbridge mech driver

Browse Source 
Server-side implementation of the linuxbridge mechanism driver is
included by the ml2 plugin (common) package, and we only need
the agent package now.

Closes-Bug: #1978270
Change-Id: I011016900ce218a7de5859bb86af4d0e3fa42304
This commit is contained in:
Takashi Kajinami
2022-06-10 10:22:32 +09:00
parent c86f68df96
commit c7f4421923
3 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/agents/ml2/linuxbridge.pp
View File

@@ -152,22 +152,10 @@ class neutron::agents::ml2::linuxbridge (
neutron_agent_linuxbridge { 'securitygroup/firewall_driver': ensure => absent }
}
if $::neutron::params::linuxbridge_agent_package {
package { 'neutron-plugin-linuxbridge-agent':
ensure => $package_ensure,
name => $::neutron::params::linuxbridge_agent_package,
tag => ['openstack', 'neutron-package'],
}
} else {
# Some platforms (RedHat) do not provide a separate
# neutron plugin linuxbridge agent package.
if ! defined(Package['neutron-plugin-linuxbridge-agent']) {
package { 'neutron-plugin-linuxbridge-agent':
ensure => $package_ensure,
name => $::neutron::params::linuxbridge_server_package,
tag => ['openstack', 'neutron-package'],
}
}
package { 'neutron-plugin-linuxbridge-agent':
ensure => $package_ensure,
name => $::neutron::params::linuxbridge_agent_package,
tag => ['openstack', 'neutron-package'],
}
if $manage_service {

4
manifests/params.pp
View File

@@ -44,8 +44,7 @@ class neutron::params {
$ovs_agent_package = false
$ovs_server_package = 'openstack-neutron-openvswitch'
$ovs_cleanup_service = 'neutron-ovs-cleanup'
$linuxbridge_agent_package = false
$linuxbridge_server_package = 'openstack-neutron-linuxbridge'
$linuxbridge_agent_package = 'openstack-neutron-linuxbridge'
$sriov_nic_agent_service = 'neutron-sriov-nic-agent'
$sriov_nic_agent_package = 'openstack-neutron-sriov-nic-agent'
$dhcp_agent_package = false
@@ -97,7 +96,6 @@ class neutron::params {
$ovs_server_package = 'neutron-plugin-openvswitch'
$ovs_cleanup_service = false
$linuxbridge_agent_package = 'neutron-linuxbridge-agent'
$linuxbridge_server_package = 'neutron-plugin-linuxbridge'
$sriov_nic_agent_service = 'neutron-sriov-agent'
$sriov_nic_agent_package = 'neutron-sriov-agent'
$dhcp_agent_package = 'neutron-dhcp-agent'

12
spec/classes/neutron_agents_ml2_linuxbridge_spec.rb
View File

@@ -41,14 +41,8 @@ describe 'neutron::agents::ml2::linuxbridge' do
end
it 'installs neutron linuxbridge agent package' do
if platform_params.has_key?(:linuxbridge_agent_package)
linuxbridge_agent_package = platform_params[:linuxbridge_agent_package]
else
linuxbridge_agent_package = platform_params[:linuxbridge_server_package]
end
should contain_package('neutron-plugin-linuxbridge-agent').with(
:name => linuxbridge_agent_package,
:name => platform_params[:linuxbridge_agent_package],
:ensure => default_params[:package_ensure],
:tag => ['openstack', 'neutron-package'],
)
@@ -172,8 +166,8 @@ describe 'neutron::agents::ml2::linuxbridge' do
}
when 'RedHat'
{
:linuxbridge_server_package => 'openstack-neutron-linuxbridge',
:linuxbridge_agent_service => 'neutron-linuxbridge-agent'
:linuxbridge_agent_package => 'openstack-neutron-linuxbridge',
:linuxbridge_agent_service => 'neutron-linuxbridge-agent'
}
end
end