openstack/puppet-neutron
Code Issues Proposed changes

Do not define service resource when service management is disabled

Browse Source 
Change-Id: Ibbdab404674b195b3758b71db1edce8db3a2c660
This commit is contained in:
Takashi Kajinami
2022-02-10 22:32:44 +09:00
parent 958cfd7aa3
commit 59b2e9a4ae
25 changed files with 248 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/agents/dhcp.pp
View File

@@ -223,12 +223,11 @@ class neutron::agents::dhcp (
} else {
$service_ensure = 'stopped'
}
}
service { 'neutron-dhcp-service':
ensure => $service_ensure,
name => $::neutron::params::dhcp_agent_service,
enable => $enabled,
tag => 'neutron-service',
service { 'neutron-dhcp-service':
ensure => $service_ensure,
name => $::neutron::params::dhcp_agent_service,
enable => $enabled,
tag => 'neutron-service',
}
}
}

13
manifests/agents/metadata.pp
View File

@@ -141,12 +141,11 @@ class neutron::agents::metadata (
} else {
$service_ensure = 'stopped'
}
}
service { 'neutron-metadata':
ensure => $service_ensure,
name => $::neutron::params::metadata_agent_service,
enable => $enabled,
tag => 'neutron-service',
service { 'neutron-metadata':
ensure => $service_ensure,
name => $::neutron::params::metadata_agent_service,
enable => $enabled,
tag => 'neutron-service',
}
}
}

13
manifests/agents/metering.pp
View File

@@ -104,12 +104,11 @@ class neutron::agents::metering (
} else {
$service_ensure = 'stopped'
}
}
service { 'neutron-metering-service':
ensure => $service_ensure,
name => $::neutron::params::metering_agent_service,
enable => $enabled,
tag => 'neutron-service',
service { 'neutron-metering-service':
ensure => $service_ensure,
name => $::neutron::params::metering_agent_service,
enable => $enabled,
tag => 'neutron-service',
}
}
}

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

@@ -176,21 +176,11 @@ class neutron::agents::ml2::linuxbridge (
} else {
$service_ensure = 'stopped'
}
}
if $::neutron::default_transport_url {
$linuxbridge_agent_subscribe = [
Neutron_config['DEFAULT/transport_url']
]
} else {
$linuxbridge_agent_subscribe = undef
}
service { 'neutron-plugin-linuxbridge-agent':
ensure => $service_ensure,
name => $::neutron::params::linuxbridge_agent_service,
enable => $enabled,
tag => 'neutron-service',
subscribe => $linuxbridge_agent_subscribe,
service { 'neutron-plugin-linuxbridge-agent':
ensure => $service_ensure,
name => $::neutron::params::linuxbridge_agent_service,
enable => $enabled,
tag => 'neutron-service',
}
}
}

25
manifests/agents/ml2/mlnx.pp
View File

@@ -120,20 +120,19 @@ class neutron::agents::ml2::mlnx (
} else {
$service_ensure = 'stopped'
}
}
service { $mlnx_agent_service:
ensure => $service_ensure,
name => $mlnx_agent_service,
enable => $enabled,
tag => 'neutron-service',
}
service { $mlnx_agent_service:
ensure => $service_ensure,
name => $mlnx_agent_service,
enable => $enabled,
tag => 'neutron-service',
}
service { $eswitchd_service:
ensure => $service_ensure,
name => $eswitchd_service,
enable => $enabled,
tag => 'neutron-service',
service { $eswitchd_service:
ensure => $service_ensure,
name => $eswitchd_service,
enable => $enabled,
tag => 'neutron-service',
}
}
}

40
manifests/agents/ml2/ovs.pp
View File

@@ -540,31 +540,31 @@ class neutron::agents::ml2::ovs (
} else {
$service_ensure = 'stopped'
}
}
service { 'neutron-ovs-agent-service':
ensure => $service_ensure,
name => $::neutron::params::ovs_agent_service,
enable => $enabled,
tag => ['neutron-service', 'neutron-db-sync-service'],
}
if ($::osfamily == 'Redhat') {
service { 'neutron-destroy-patch-ports-service':
service { 'neutron-ovs-agent-service':
ensure => $service_ensure,
name => $::neutron::params::destroy_patch_ports_service,
name => $::neutron::params::ovs_agent_service,
enable => $enabled,
tag => ['neutron-service'],
tag => ['neutron-service', 'neutron-db-sync-service'],
}
}
if $::neutron::params::ovs_cleanup_service {
service { 'ovs-cleanup-service':
name => $::neutron::params::ovs_cleanup_service,
enable => $enabled,
# TODO: Remove this require once ovs-cleanup service
# script is packaged in neutron-openvswitch package
require => Anchor['neutron::install::end'],
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 {
service { 'ovs-cleanup-service':
name => $::neutron::params::ovs_cleanup_service,
enable => $enabled,
# TODO: Remove this require once ovs-cleanup service
# script is packaged in neutron-openvswitch package
require => Anchor['neutron::install::end'],
}
}
}
}

13
manifests/agents/ml2/sriov.pp
View File

@@ -150,13 +150,12 @@ class neutron::agents::ml2::sriov (
} else {
$service_ensure = 'stopped'
}
}
service { 'neutron-sriov-nic-agent-service':
ensure => $service_ensure,
name => $::neutron::params::sriov_nic_agent_service,
enable => $enabled,
tag => 'neutron-service',
service { 'neutron-sriov-nic-agent-service':
ensure => $service_ensure,
name => $::neutron::params::sriov_nic_agent_service,
enable => $enabled,
tag => 'neutron-service',
}
}
if ($resource_provider_bandwidths != []) {

13
manifests/agents/ml2/vpp.pp
View File

@@ -86,12 +86,11 @@ class neutron::agents::ml2::vpp (
} else {
$service_ensure = 'stopped'
}
}
service { 'neutron-vpp-agent-service':
ensure => $service_ensure,
name => $::neutron::params::vpp_agent_service,
enable => $enabled,
tag => ['neutron-service'],
service { 'neutron-vpp-agent-service':
ensure => $service_ensure,
name => $::neutron::params::vpp_agent_service,
enable => $enabled,
tag => ['neutron-service'],
}
}
}

15
manifests/agents/ovn_metadata.pp
View File

@@ -195,13 +195,13 @@ class neutron::agents::ovn_metadata (
} else {
$service_ensure = 'stopped'
}
}
service { 'ovn-metadata':
ensure => $service_ensure,
name => $::neutron::params::ovn_metadata_agent_service,
enable => $enabled,
tag => 'neutron-service',
service { 'ovn-metadata':
ensure => $service_ensure,
name => $::neutron::params::ovn_metadata_agent_service,
enable => $enabled,
tag => 'neutron-service',
}
Exec['Set OVS Manager'] -> Service['ovn-metadata']
}
# Set OVS manager so that metadata agent can connect to Open vSwitch
@@ -210,7 +210,6 @@ class neutron::agents::ovn_metadata (
-- add Open_vSwitch . manager_options @manager",
unless => "ovs-vsctl show | grep \"${ovs_manager}\"",
path => '/usr/sbin:/usr/bin:/sbin:/bin',
notify => Service['ovn-metadata'],
}
Package<| title == 'ovn-metadata' |> -> Exec['Set OVS Manager']

162
manifests/server.pp
View File

@@ -394,98 +394,98 @@ class neutron::server (
} else {
$service_ensure = 'stopped'
}
}
# $service_name is the old 'neutron-server' service. If it is in use,
# then we don't need to start neutron-api and neutron-rpc-server. If
# it is not, then we must start neutron-api and neutron-rpc-server instead.
if $service_name {
if $service_name == $::neutron::params::server_service {
service { 'neutron-server':
ensure => $service_ensure,
name => $::neutron::params::server_service,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service', 'neutron-db-sync-service', 'neutron-server-eventlet'],
}
} elsif $service_name == 'httpd' {
fail('Use api_service_name and rpc_service_name to run api service by httpd')
} else {
warning('Support for arbitaly service name is deprecated')
# backward compatibility so operators can customize the service name.
service { 'neutron-server':
ensure => $service_ensure,
name => $service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service', 'neutron-db-sync-service'],
}
}
} else {
if $::neutron::params::server_service {
# we need to make sure neutron-server is stopped before trying to
# start separate services.
service { 'neutron-server':
ensure => 'stopped',
name => $::neutron::params::server_service,
enable => false,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service'],
}
}
if $api_service_name {
if $api_service_name == 'httpd' {
Service <| title == 'httpd' |> { tag +> 'neutron-service' }
if $::neutron::params::server_service {
Service['neutron-server'] -> Service['httpd']
}
if $::neutron::params::api_service_name {
# we need to make sure api service is stopped before trying to
# start apache
service { 'neutron-api':
ensure => 'stopped',
name => $::neutron::params::api_service_name,
enable => false,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service'],
}
Service['neutron-api'] -> Service['httpd']
}
} else {
service { 'neutron-api':
# $service_name is the old 'neutron-server' service. If it is in use,
# then we don't need to start neutron-api and neutron-rpc-server. If
# it is not, then we must start neutron-api and neutron-rpc-server instead.
if $service_name {
if $service_name == $::neutron::params::server_service {
service { 'neutron-server':
ensure => $service_ensure,
name => $api_service_name,
name => $::neutron::params::server_service,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service', 'neutron-db-sync-service', 'neutron-server-eventlet'],
}
if $::neutron::params::server_service {
Service['neutron-server'] -> Service['neutron-api']
} elsif $service_name == 'httpd' {
fail('Use api_service_name and rpc_service_name to run api service by httpd')
} else {
warning('Support for arbitaly service name is deprecated')
# backward compatibility so operators can customize the service name.
service { 'neutron-server':
ensure => $service_ensure,
name => $service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service', 'neutron-db-sync-service'],
}
}
}
if $rpc_service_name {
service { 'neutron-rpc-server':
ensure => $service_ensure,
name => $rpc_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service', 'neutron-db-sync-service'],
} else {
if $::neutron::params::server_service {
# we need to make sure neutron-server is stopped before trying to
# start separate services.
service { 'neutron-server':
ensure => 'stopped',
name => $::neutron::params::server_service,
enable => false,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service'],
}
}
if $::neutron::params::server_service {
Service['neutron-server'] -> Service['neutron-rpc-server']
if $api_service_name {
if $api_service_name == 'httpd' {
Service <| title == 'httpd' |> { tag +> 'neutron-service' }
if $::neutron::params::server_service {
Service['neutron-server'] -> Service['httpd']
}
if $::neutron::params::api_service_name {
# we need to make sure api service is stopped before trying to
# start apache
service { 'neutron-api':
ensure => 'stopped',
name => $::neutron::params::api_service_name,
enable => false,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service'],
}
Service['neutron-api'] -> Service['httpd']
}
} else {
service { 'neutron-api':
ensure => $service_ensure,
name => $api_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service', 'neutron-db-sync-service', 'neutron-server-eventlet'],
}
if $::neutron::params::server_service {
Service['neutron-server'] -> Service['neutron-api']
}
}
}
if $rpc_service_name {
service { 'neutron-rpc-server':
ensure => $service_ensure,
name => $rpc_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['neutron-service', 'neutron-db-sync-service'],
}
if $::neutron::params::server_service {
Service['neutron-server'] -> Service['neutron-rpc-server']
}
}
}
}

12
spec/classes/neutron_agents_bagpipe_spec.rb
View File

@@ -25,7 +25,6 @@ describe 'neutron::agents::bagpipe' do
:dataplane_driver_ipvpn => 'ovs',
:enabled => true,
:enable_rtc => true,
:manage_service => true,
:mpls_interface => '*gre*',
:ovs_bridge => 'br-mpls',
:package_ensure => 'present',
@@ -87,6 +86,17 @@ describe 'neutron::agents::bagpipe' do
).with_value(p[:peers].join(','))
end
end
context 'with manage_service as false' do
before :each do
params.merge!(:manage_service => false)
end
it 'should not manage the service' do
should_not contain_service('bagpipe-bgp')
end
end
end
on_supported_os({

28
spec/classes/neutron_agents_bgp_dragent_spec.rb
View File

@@ -21,7 +21,6 @@ describe 'neutron::agents::bgp_dragent' do
{
:package_ensure => 'installed',
:enabled => true,
:manage_service => true,
:bgp_speaker_driver => 'neutron_dynamic_routing.services.bgp.agent.driver.os_ken.driver.OsKenBgpDriver',
:purge_config => false,
}
@@ -94,6 +93,15 @@ describe 'neutron::agents::bgp_dragent' do
:tag => 'neutron-service',
)}
end
context 'with manage_service as false' do
before :each do
params.merge!(:manage_service => false)
end
it 'should not manage the service' do
should_not contain_service('neutron-bgp-dragent')
end
end
end
shared_examples 'neutron::agents::bgp_dragent on Debian' do
@@ -143,6 +151,15 @@ describe 'neutron::agents::bgp_dragent' do
:tag => 'neutron-service',
)}
end
context 'with manage_service as false' do
before :each do
params.merge!(:manage_service => false)
end
it 'should not manage the service' do
should_not contain_service('neutron-bgp-dragent')
end
end
end
shared_examples 'neutron::agents::bgp_dragent on Ubuntu' do
@@ -192,6 +209,15 @@ describe 'neutron::agents::bgp_dragent' do
:tag => 'neutron-service',
)}
end
context 'with manage_service as false' do
before :each do
params.merge!(:manage_service => false)
end
it 'should not manage the service' do
should_not contain_service('neutron-bgp-dragent')
end
end
end
on_supported_os({

4
spec/classes/neutron_agents_dhcp_spec.rb
View File

@@ -91,8 +91,8 @@ describe 'neutron::agents::dhcp' do
before :each do
params.merge!(:manage_service => false)
end
it 'should not start/stop service' do
should contain_service('neutron-dhcp-service').without_ensure
it 'should not manage the service' do
should_not contain_service('neutron-dhcp-service')
end
end

10
spec/classes/neutron_agents_l2gw_spec.rb
View File

@@ -21,7 +21,6 @@ describe 'neutron::agents::l2gw' do
{ :package_ensure => 'present',
:purge_config => false,
:enabled => true,
:manage_service => true,
:enable_manager => false,
:manager_table_listening_port => '6632',
:socket_timeout => '30',
@@ -67,6 +66,15 @@ describe 'neutron::agents::l2gw' do
should contain_service('neutron-l2gw-agent').with_ensure('running')
end
context 'with manage_service as false' do
before :each do
params.merge!(:manage_service => false)
end
it 'should not manage the service' do
should_not contain_service('neutron-l2gw-agent')
end
end
context 'with multiple ovsdb_hosts' do
before :each do
params.merge!(

9
spec/classes/neutron_agents_l3_spec.rb
View File

@@ -88,6 +88,15 @@ describe 'neutron::agents::l3' do
end
end
context 'with manage_service as false' do
before :each do
params.merge!(:manage_service => false)
end
it 'should not manage the service' do
should_not contain_service('neutron-l3')
end
end
context 'with DVR' do
before :each do
params.merge!(:agent_mode => 'dvr')

4
spec/classes/neutron_agents_metadata_spec.rb
View File

@@ -34,8 +34,8 @@ describe 'neutron::agents::metadata' do
params.merge!(:manage_service => false)
end
it 'should not start/stop service' do
should contain_service('neutron-metadata').without_ensure
it 'should not manage the service' do
should_not contain_service('neutron-metadata')
end
end

4
spec/classes/neutron_agents_metering_spec.rb
View File

@@ -91,8 +91,8 @@ describe 'neutron::agents::metering' do
params.merge!(:manage_service => false)
end
it 'should not start/stop service' do
should contain_service('neutron-metering-service').without_ensure
it 'should not manage the service' do
should_not contain_service('neutron-metering-service')
end
end

5
spec/classes/neutron_agents_ml2_linuxbridge_spec.rb
View File

@@ -9,7 +9,6 @@ describe 'neutron::agents::ml2::linuxbridge' do
{
:package_ensure => 'present',
:enabled => true,
:manage_service => true,
:tunnel_types => [],
:local_ip => false,
:physical_interface_mappings => [],
@@ -70,8 +69,8 @@ describe 'neutron::agents::ml2::linuxbridge' do
before :each do
params.merge!(:manage_service => false)
end
it 'should not start/stop service' do
should contain_service('neutron-plugin-linuxbridge-agent').without_ensure
it 'should not manage the service' do
should_not contain_service('neutron-plugin-linuxbridge-agent')
end
end

11
spec/classes/neutron_agents_ml2_mlnx_spec.rb
View File

@@ -7,9 +7,8 @@ describe 'neutron::agents::ml2::mlnx' do
let :default_params do
{
:package_ensure => 'present',
:enabled => true,
:manage_service => true
:package_ensure => 'present',
:enabled => true,
}
end
@@ -57,9 +56,9 @@ describe 'neutron::agents::ml2::mlnx' do
before :each do
params.merge!(:manage_service => false)
end
it 'should not start/stop service' do
should contain_service(platform_params[:mlnx_agent_service]).without_ensure
should contain_service('eswitchd').without_ensure
it 'should not manage the services' do
should_not contain_service(platform_params[:mlnx_agent_service])
should_not contain_service('eswitchd')
end
end

11
spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb
View File

@@ -104,6 +104,17 @@ describe 'neutron::agents::ml2::networking_baremetal' do
should contain_ironic_neutron_agent_config('ironic/system_scope').with_value('all')
end
end
context 'with manage_service as false' do
before :each do
params.merge!(:manage_service => false)
end
it 'should not manage the service' do
should_not contain_service('ironic-neutron-agent-service')
end
end
end
on_supported_os({

4
spec/classes/neutron_agents_ml2_ovs_spec.rb
View File

@@ -114,8 +114,8 @@ describe 'neutron::agents::ml2::ovs' do
before :each do
params.merge!(:manage_service => false)
end
it 'should not start/stop service' do
should contain_service('neutron-ovs-agent-service').without_ensure
it 'should not manage the service' do
should_not contain_service('neutron-ovs-agent-service')
end
end

5
spec/classes/neutron_agents_ml2_sriov_spec.rb
View File

@@ -9,7 +9,6 @@ describe 'neutron::agents::ml2::sriov' do
{
:package_ensure => 'present',
:enabled => true,
:manage_service => true,
:polling_interval => 2,
:supported_pci_vendor_devs => [],
:purge_config => false,
@@ -104,8 +103,8 @@ describe 'neutron::agents::ml2::sriov' do
before :each do
params.merge!(:manage_service => false)
end
it 'should not start/stop service' do
should contain_service('neutron-sriov-nic-agent-service').without_ensure
it 'should not manage the service' do
should_not contain_service('neutron-sriov-nic-agent-service')
end
end

5
spec/classes/neutron_agents_ml2_vpp_spec.rb
View File

@@ -8,7 +8,6 @@ describe 'neutron::agents::ml2::vpp' do
let :default_params do
{ :package_ensure => 'present',
:enabled => true,
:manage_service => true,
:etcd_host => '127.0.0.1',
:etcd_port => 4001,
}
@@ -60,8 +59,8 @@ describe 'neutron::agents::ml2::vpp' do
before :each do
params.merge!(:manage_service => false)
end
it 'should not start/stop service' do
should contain_service('neutron-vpp-agent-service').without_ensure
it 'should not manage the service' do
should_not contain_service('neutron-vpp-agent-service')
end
end

4
spec/classes/neutron_agents_ovn_metadata_spec.rb
View File

@@ -37,8 +37,8 @@ describe 'neutron::agents::ovn_metadata' do
params.merge!(:manage_service => false)
end
it 'should not start/stop service' do
should contain_service('ovn-metadata').without_ensure
it 'should not manage the service' do
should_not contain_service('ovn-metadata')
end
end

8
spec/classes/neutron_server_spec.rb
View File

@@ -99,12 +99,12 @@ describe 'neutron::server' do
params.merge!(:manage_service => false)
end
it 'should not start/stop service' do
it 'should not manage the service' do
if platform_params.has_key?(:server_service)
should contain_service('neutron-server').without_ensure
should_not contain_service('neutron-server')
else
should contain_service('neutron-api').without_ensure
should contain_service('neutron-rpc-server').without_ensure
should_not contain_service('neutron-api')
should_not contain_service('neutron-rpc-server')
end
end
end