openstack/puppet-neutron
Code Issues Proposed changes

networking-baremetal: Support [ironic] valid_interfaces

Browse Source 
... so that users can select the endpoint to be used for Neutron API
call by ironic-neutron-agent.

Change-Id: Ibd4b5f0dbc42609cbed076368466c18fec60a5db
This commit is contained in:
Takashi Kajinami 2022-05-11 15:22:04 +09:00
parent df0d55cf78
commit 2b4dd064ca
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/agents/ml2/networking_baremetal.pp
View File

@ -84,6 +84,10 @@
# (optional) Maximum number of retries in case of conflict error (HTTP 409).
# Defaults to $::os_service_default
#
# [*valid_interfaces*]
# (Optional) List of interfaces, in order of preference for endpoint URL.
# Defaults to $::os_service_default
#
# [*purge_config*]
# (optional) Whether to set only the specified config options in the
# ironic-neutron-agent config.
@ -116,6 +120,7 @@ class neutron::agents::ml2::networking_baremetal (
$region_name = $::os_service_default,
$status_code_retry_delay = $::os_service_default,
$status_code_retries = $::os_service_default,
$valid_interfaces = $::os_service_default,
$purge_config = false,
$report_interval = $::os_service_default,
) {
@ -152,6 +157,7 @@ class neutron::agents::ml2::networking_baremetal (
'ironic/region_name': value => $region_name;
'ironic/status_code_retry_delay': value => $status_code_retry_delay;
'ironic/status_code_retries': value => $status_code_retries;
'ironic/valid_interfaces': value => join(any2array($valid_interfaces), ',');
'agent/report_interval': value => $report_interval;
}

6
releasenotes/notes/networking-baremetal-valid_interfaces-f4c5011db9792354.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
The ``neutron::agents::ml2::networking_baremetal`` class now supports
the new ``valid_interfaces`` parameter. This parameter controls
the ``[ironic] valid_interfaces`` option in ``ironic_neutron_agent.ini``.

1
spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb
View File

@ -51,6 +51,7 @@ describe 'neutron::agents::ml2::networking_baremetal' do
should contain_ironic_neutron_agent_config('ironic/region_name').with_value('<SERVICE DEFAULT>')
should contain_ironic_neutron_agent_config('ironic/status_code_retry_delay').with_value('<SERVICE DEFAULT>')
should contain_ironic_neutron_agent_config('ironic/status_code_retries').with_value('<SERVICE DEFAULT>')
should contain_ironic_neutron_agent_config('ironic/valid_interfaces').with_value('<SERVICE DEFAULT>')
should contain_ironic_neutron_agent_config('agent/report_interval').with_value('<SERVICE DEFAULT>')
end