From 36be5cecad5afb15f2598fd19798e7797453d814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Thu, 26 Aug 2021 15:48:59 +0200 Subject: [PATCH] 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 9574cd4d0f65fd6f7a5a6e04379f8bc4fd6c020c) --- .../ironic/ironic-neutron-agent-container-puppet.yaml | 9 +++++++++ ...ing-baremetal-report-interval-d08a44a147a1846e.yaml | 10 ++++++++++ 2 files changed, 19 insertions(+) create mode 100644 releasenotes/notes/networking-baremetal-report-interval-d08a44a147a1846e.yaml diff --git a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml index 48d03b3419..3599ac966d 100644 --- a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml +++ b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml @@ -41,6 +41,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: ContainersCommon: @@ -75,6 +83,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 diff --git a/releasenotes/notes/networking-baremetal-report-interval-d08a44a147a1846e.yaml b/releasenotes/notes/networking-baremetal-report-interval-d08a44a147a1846e.yaml new file mode 100644 index 0000000000..31f6244315 --- /dev/null +++ b/releasenotes/notes/networking-baremetal-report-interval-d08a44a147a1846e.yaml @@ -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 `_. +