Enable neutron-destroy-port-patches service
Change https://review.rdoproject.org/r/#/c/10145/ introduced a new systemd service. We need to enable the service to take effect. Change-Id: I54b7d0ef46c90ee827d440d3cb0c485090e749d5 Related: rhbz#1490281 Closes-bug: #1726777
This commit is contained in:
@@ -348,6 +348,15 @@ class neutron::agents::ml2::ovs (
|
|||||||
tag => ['neutron-service', 'neutron-db-sync-service'],
|
tag => ['neutron-service', 'neutron-db-sync-service'],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($::osfamily == 'Redhat') {
|
||||||
|
service { 'neutron-destroy-patch-ports-service':
|
||||||
|
ensure => $service_ensure,
|
||||||
|
name => $::neutron::params::destroy_patch_ports_service,
|
||||||
|
enable => $enabled,
|
||||||
|
tag => ['neutron-service'],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if $::neutron::params::ovs_cleanup_service {
|
if $::neutron::params::ovs_cleanup_service {
|
||||||
service { 'ovs-cleanup-service':
|
service { 'ovs-cleanup-service':
|
||||||
name => $::neutron::params::ovs_cleanup_service,
|
name => $::neutron::params::ovs_cleanup_service,
|
||||||
|
@@ -8,6 +8,7 @@ class neutron::params {
|
|||||||
$client_package = 'python-neutronclient'
|
$client_package = 'python-neutronclient'
|
||||||
$server_service = 'neutron-server'
|
$server_service = 'neutron-server'
|
||||||
$ovs_agent_service = 'neutron-openvswitch-agent'
|
$ovs_agent_service = 'neutron-openvswitch-agent'
|
||||||
|
$destroy_patch_ports_service = 'neutron-destroy-patch-ports'
|
||||||
$linuxbridge_agent_service = 'neutron-linuxbridge-agent'
|
$linuxbridge_agent_service = 'neutron-linuxbridge-agent'
|
||||||
$cisco_config_file = '/etc/neutron/plugins/cisco/cisco_plugins.ini'
|
$cisco_config_file = '/etc/neutron/plugins/cisco/cisco_plugins.ini'
|
||||||
$opencontrail_plugin_package = 'neutron-plugin-contrail'
|
$opencontrail_plugin_package = 'neutron-plugin-contrail'
|
||||||
|
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
A new systemd service ``neutron-destroy-patch-ports`` was
|
||||||
|
introduced on RHEL based systems. The service is executed only on
|
||||||
|
boot and its purpose is to clean up patch ports between the Neutron
|
||||||
|
integration bridge and other configured provider bridges.
|
@@ -308,6 +308,15 @@ describe 'neutron::agents::ml2::ovs' do
|
|||||||
is_expected.to contain_package('neutron-ovs-agent').that_notifies('Anchor[neutron::install::end]')
|
is_expected.to contain_package('neutron-ovs-agent').that_notifies('Anchor[neutron::install::end]')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'configures neutron destroy patch ports service' do
|
||||||
|
is_expected.to contain_service('neutron-destroy-patch-ports-service').with(
|
||||||
|
:name => platform_params[:destroy_patch_ports_service],
|
||||||
|
:enable => true,
|
||||||
|
:ensure => 'running',
|
||||||
|
:tag => ['neutron-service'],
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
context 'when enabling dpdk with manage vswitch is default' do
|
context 'when enabling dpdk with manage vswitch is default' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { 'vswitch::dpdk': host_core_list => '1,2', memory_channels => '1' }"
|
"class { 'vswitch::dpdk': host_core_list => '1,2', memory_channels => '1' }"
|
||||||
@@ -340,7 +349,8 @@ describe 'neutron::agents::ml2::ovs' do
|
|||||||
:ovs_agent_service => 'neutron-openvswitch-agent' }
|
:ovs_agent_service => 'neutron-openvswitch-agent' }
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{ :ovs_cleanup_service => 'neutron-ovs-cleanup',
|
{ :ovs_cleanup_service => 'neutron-ovs-cleanup',
|
||||||
:ovs_agent_service => 'neutron-openvswitch-agent' }
|
:ovs_agent_service => 'neutron-openvswitch-agent',
|
||||||
|
:destroy_patch_ports_service => 'neutron-destroy-patch-ports' }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user