Add IronicNeutronAgentReportInterval parameter

Add IronicNeutronAgentReportInterval with a default of
30 seconds.

Previously the ironic-neutron-agent used the global report
interval in neutron. The global interval was increased to
300s in change: Ib3f7cd9d6c050140a5e8b59adf7fd8f65b12df2f.

While the 300s interval may make sense for other agents,
the ironic-neutron-agent can keep reporting at 30s, the
previous default.

Conflicts:
  deployment/ironic/ironic-neutron-agent-container-puppet.yaml

Closes-Bug: #1940838
Depends-On: https://review.opendev.org/828409
Change-Id: Id77662e9dd466ec8609354c2dbeee8592f599e72
(cherry picked from commit 9574cd4d0f)
This commit is contained in:
Harald Jensås 2021-08-26 15:48:59 +02:00
parent 91ac84c352
commit 0db8d673d8
2 changed files with 19 additions and 0 deletions

View File

@ -44,6 +44,14 @@ parameters:
type: string
default: 'regionOne'
description: Keystone region for endpoint
IronicNeutronAgentReportInterval:
type: number
default: 30
description: |
Seconds between reporting ironic node port state to server; should be
less than NeutronAgentDownTime, best if it is half or less than
NeutronAgentDownTime.
resources:
@ -80,6 +88,7 @@ outputs:
neutron::agents::ml2::networking_baremetal::user_domain_name: 'Default'
neutron::agents::ml2::networking_baremetal::project_domain_name: 'Default'
neutron::agents::ml2::networking_baremetal::region_name: {get_param: KeystoneRegion}
neutron::agents::ml2::networking_baremetal::report_interval: {get_param: IronicNeutronAgentReportInterval}
- get_attr: [NeutronLogging, config_settings]
puppet_config:
config_volume: neutron

View File

@ -0,0 +1,10 @@
---
fixes:
- |
The neutron agent report interval was recently changed from the 30s
default to 300s. This caused issues whith timeouts when providing
baremetal nodes. A new parameter IronicNeutronAgentReportInterval
has been added with a default of 30s so that the report interval
specifically for the networking baremetal agent is restored.
See bug: `1940838 <https://bugs.launchpad.net/tripleo/+bug/1940838>`_.