From dae33092a120655dfe4b9a550ec29a8c2dba73a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Thu, 26 Aug 2021 15:33:19 +0200 Subject: [PATCH] Add report_inteval parameter in ml2 baremetal Add the parameter $report_interval to the ml2 networking-baremetal manifest. By default the global report_interval as defined in neutron.conf is used. In some cases it makes sense to change the report_interval specifically for ironic-neutron-agent. Related-Bug: #1940838 Change-Id: I6fc0eb085c09fb1e24ff09d4f8199d2cf57dd209 --- manifests/agents/ml2/networking_baremetal.pp | 9 +++++++++ ...rking-baremetal-report-interval-634d1bf90139cbeb.yaml | 7 +++++++ .../neutron_agents_ml2_networking_baremetal_spec.rb | 1 + 3 files changed, 17 insertions(+) create mode 100644 releasenotes/notes/networking-baremetal-report-interval-634d1bf90139cbeb.yaml diff --git a/manifests/agents/ml2/networking_baremetal.pp b/manifests/agents/ml2/networking_baremetal.pp index 59b10e979..71943736b 100644 --- a/manifests/agents/ml2/networking_baremetal.pp +++ b/manifests/agents/ml2/networking_baremetal.pp @@ -85,6 +85,13 @@ # ironic-neutron-agent config. # Defaults to false. # +# [*report_interval*] +# (optional) Set the agent report interval. By default the global report +# interval in neutron.conf ([agent]/report_interval) is used. This parameter +# can be used to override the reporting interval for the +# ironic-neutron-agent. +# Defaults to $::os_service_default +# # DEPRECATED PARAMETERS # # [*auth_strategy*] @@ -124,6 +131,7 @@ class neutron::agents::ml2::networking_baremetal ( $status_code_retry_delay = $::os_service_default, $status_code_retries = $::os_service_default, $purge_config = false, + $report_interval = $::os_service_default, # DEPRECATED PARAMETERS $auth_strategy = undef, $ironic_url = undef, @@ -190,6 +198,7 @@ Use status_code_retries instead.') 'ironic/region_name': value => $region_name; 'ironic/status_code_retry_delay': value => $status_code_retry_delay_real; 'ironic/status_code_retries': value => $status_code_retries_real; + 'agent/report_interval': value => $report_interval; } package { 'python-ironic-neutron-agent': diff --git a/releasenotes/notes/networking-baremetal-report-interval-634d1bf90139cbeb.yaml b/releasenotes/notes/networking-baremetal-report-interval-634d1bf90139cbeb.yaml new file mode 100644 index 000000000..c514f1a5c --- /dev/null +++ b/releasenotes/notes/networking-baremetal-report-interval-634d1bf90139cbeb.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + It is now possible to set the report interval for the networking-baremetal + ml2 agent by using new parameter ``report_interval`` in the + ``neutron::agents::ml2::networking_baremetal`` class. + diff --git a/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb b/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb index 6d9188b1f..3c2b49971 100644 --- a/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb +++ b/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb @@ -50,6 +50,7 @@ describe 'neutron::agents::ml2::networking_baremetal' do should contain_ironic_neutron_agent_config('ironic/region_name').with_value('') should contain_ironic_neutron_agent_config('ironic/status_code_retry_delay').with_value('') should contain_ironic_neutron_agent_config('ironic/status_code_retries').with_value('') + should contain_ironic_neutron_agent_config('agent/report_interval').with_value('') end it 'installs ironic-neutron-agent agent package' do