Set agent debug config defaults to service default
A few of the neutron agents had a default of 'false' for the debug flag. This interferes with the common practice of enabling debug through a common configuration file (e.g. /etc/neutron.conf). This patch changes the default to ::os_service_default allowing it to either use the service default, values set in some common configuration or explicitly. Change-Id: I7d7a1e4776861dc8d94a143edc0df76c3f963ef8 Closes-Bug: #1733071
This commit is contained in:
parent
2f6c873960
commit
edb9ceb6c9
@ -19,7 +19,7 @@
|
||||
#
|
||||
# [*debug*]
|
||||
# (optional) Print debug info in logs
|
||||
# Defaults to false
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*ovsdb_hosts*]
|
||||
# (optional) OVSDB server tuples in the format
|
||||
@ -73,7 +73,7 @@ class neutron::agents::l2gw (
|
||||
$package_ensure = 'present',
|
||||
$enabled = true,
|
||||
$manage_service = true,
|
||||
$debug = false,
|
||||
$debug = $::os_service_default,
|
||||
$ovsdb_hosts = $::os_service_default,
|
||||
$enable_manager = false,
|
||||
$manager_table_listening_port = '6632',
|
||||
|
@ -20,7 +20,7 @@
|
||||
#
|
||||
# [*debug*]
|
||||
# (optional) Print debug info in logs
|
||||
# Defaults to false
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*interface_driver*]
|
||||
# (optional) Driver to interface with neutron
|
||||
@ -98,7 +98,7 @@ class neutron::agents::l3 (
|
||||
$package_ensure = 'present',
|
||||
$enabled = true,
|
||||
$manage_service = true,
|
||||
$debug = false,
|
||||
$debug = $::os_service_default,
|
||||
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
|
||||
$gateway_external_network_id = $::os_service_default,
|
||||
$handle_internal_only_routers = $::os_service_default,
|
||||
|
@ -18,7 +18,7 @@
|
||||
# Defaults to true
|
||||
#
|
||||
# [*debug*]
|
||||
# Debug. Defaults to false.
|
||||
# Debug. Defaults to $::os_service_default.
|
||||
#
|
||||
# [*auth_ca_cert*]
|
||||
# CA cert to check against with for ssl keystone. (Defaults to $::os_service_default)
|
||||
@ -72,7 +72,7 @@ class neutron::agents::metadata (
|
||||
$package_ensure = 'present',
|
||||
$enabled = true,
|
||||
$manage_service = true,
|
||||
$debug = false,
|
||||
$debug = $::os_service_default,
|
||||
$auth_ca_cert = $::os_service_default,
|
||||
$metadata_ip = $::os_service_default,
|
||||
$metadata_host = $::os_service_default,
|
||||
|
@ -32,7 +32,7 @@
|
||||
# Defaults to true
|
||||
#
|
||||
# [*debug*]
|
||||
# (optional) Show debugging output in log. Defaults to false.
|
||||
# (optional) Show debugging output in log. Defaults to $::os_service_default.
|
||||
#
|
||||
# [*interface_driver*]
|
||||
# (optional) Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'.
|
||||
@ -58,7 +58,7 @@ class neutron::agents::metering (
|
||||
$package_ensure = present,
|
||||
$enabled = true,
|
||||
$manage_service = true,
|
||||
$debug = false,
|
||||
$debug = $::os_service_default,
|
||||
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
|
||||
$driver = 'neutron.services.metering.drivers.noop.noop_driver.NoopMeteringDriver',
|
||||
$measure_interval = $::os_service_default,
|
||||
|
@ -0,0 +1,17 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
Debug logging is no longer overridden and disabled by default on the L2
|
||||
gateway, metering, L3 and metadata agents allowing the service default
|
||||
to take affect. Deployments requiring these services to have debug
|
||||
logging disabled independent of other related configuration may need to
|
||||
explictly set this parameters. Affected parameters are
|
||||
'neutron::agents::l2gw::debug', 'neutron:agents::l3::debug',
|
||||
'neutron::agents::metadata::debug' and 'neutron::agents::l2gw::debug'.
|
||||
|
||||
fixes:
|
||||
- |
|
||||
The L2 gateway, metering, L3 and metadata agents now use the service
|
||||
default for the debug logging unless otherwise explicitly set. This allows
|
||||
a common configuration for enabling debug logging instead of explicitly
|
||||
enabling in each service.
|
@ -23,7 +23,6 @@ describe 'neutron::agents::l2gw' do
|
||||
:purge_config => false,
|
||||
:enabled => true,
|
||||
:manage_service => true,
|
||||
:debug => false,
|
||||
:enable_manager => false,
|
||||
:manager_table_listening_port => '6632',
|
||||
:socket_timeout => '30',
|
||||
@ -58,7 +57,7 @@ describe 'neutron::agents::l2gw' do
|
||||
end
|
||||
|
||||
it 'configures l2gw_plugin.ini' do
|
||||
is_expected.to contain_neutron_l2gw_agent_config('DEFAULT/debug').with_value(p[:debug])
|
||||
is_expected.to contain_neutron_l2gw_agent_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_neutron_l2gw_agent_config('ovsdb/enable_manager').with_value(p[:enable_manager])
|
||||
is_expected.to contain_neutron_l2gw_agent_config('ovsdb/manager_table_listening_port').with_value(p[:manager_table_listening_port])
|
||||
is_expected.to contain_neutron_l2gw_agent_config('ovsdb/l2_gw_agent_priv_key_base_path').with_value('<SERVICE DEFAULT>')
|
||||
|
@ -9,7 +9,6 @@ describe 'neutron::agents::l3' do
|
||||
let :default_params do
|
||||
{ :package_ensure => 'present',
|
||||
:enabled => true,
|
||||
:debug => false,
|
||||
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
|
||||
:ha_enabled => false,
|
||||
:ha_vrrp_auth_type => 'PASS',
|
||||
@ -36,7 +35,7 @@ describe 'neutron::agents::l3' do
|
||||
it { is_expected.to contain_class('neutron::params') }
|
||||
|
||||
it 'configures l3_agent.ini' do
|
||||
is_expected.to contain_neutron_l3_agent_config('DEFAULT/debug').with_value(p[:debug])
|
||||
is_expected.to contain_neutron_l3_agent_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_neutron_l3_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver])
|
||||
is_expected.to contain_neutron_l3_agent_config('DEFAULT/gateway_external_network_id').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_neutron_l3_agent_config('DEFAULT/handle_internal_only_routers').with_value('<SERVICE DEFAULT>')
|
||||
|
@ -8,7 +8,6 @@ describe 'neutron::agents::metadata' do
|
||||
|
||||
let :params do
|
||||
{ :package_ensure => 'present',
|
||||
:debug => false,
|
||||
:enabled => true,
|
||||
:shared_secret => 'metadata-secret',
|
||||
:purge_config => false,
|
||||
@ -52,7 +51,7 @@ describe 'neutron::agents::metadata' do
|
||||
end
|
||||
|
||||
it 'configures metadata_agent.ini' do
|
||||
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/debug').with(:value => params[:debug])
|
||||
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/debug').with(:value => '<SERVICE DEFAULT>')
|
||||
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/auth_ca_cert').with(:value => '<SERVICE DEFAULT>')
|
||||
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/nova_client_cert').with(:value => '<SERVICE DEFAULT>')
|
||||
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/nova_client_priv_key').with(:value => '<SERVICE DEFAULT>')
|
||||
|
@ -35,7 +35,6 @@ describe 'neutron::agents::metering' do
|
||||
let :default_params do
|
||||
{ :package_ensure => 'present',
|
||||
:enabled => true,
|
||||
:debug => false,
|
||||
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
|
||||
:driver => 'neutron.services.metering.drivers.noop.noop_driver.NoopMeteringDriver',
|
||||
:purge_config => false,
|
||||
@ -62,7 +61,7 @@ describe 'neutron::agents::metering' do
|
||||
end
|
||||
|
||||
it 'configures metering_agent.ini' do
|
||||
is_expected.to contain_neutron_metering_agent_config('DEFAULT/debug').with_value(p[:debug]);
|
||||
is_expected.to contain_neutron_metering_agent_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>');
|
||||
is_expected.to contain_neutron_metering_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]);
|
||||
is_expected.to contain_neutron_metering_agent_config('DEFAULT/driver').with_value(p[:driver]);
|
||||
is_expected.to contain_neutron_metering_agent_config('DEFAULT/measure_interval').with_value('<SERVICE DEFAULT>');
|
||||
|
Loading…
Reference in New Issue
Block a user