openstack
/
puppet-ironic
Code Issues Proposed changes

inspector: Clean up duplicated resources for dnsmasq_interface 

The one in the base inspector class was kept for backword-compatibility
but can be removed now.

Change-Id: I0de9a8525d105741520920550d85d62b214acad5
This commit is contained in:
Takashi Kajinami 2024-05-07 14:36:07 +09:00
parent 1b582d17b3
commit fcd9e2f254
4 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/inspector.pp
View File

@ -470,7 +470,6 @@ class ironic::inspector (
'DEFAULT/timeout': value => $timeout;
'DEFAULT/api_max_limit': value => $api_max_limit;
'capabilities/boot_mode': value => $detect_boot_mode;
'iptables/dnsmasq_interface': value => $dnsmasq_interface;
'processing/ramdisk_logs_dir': value => $ramdisk_logs_dir;
'processing/always_store_ramdisk_logs': value => $always_store_ramdisk_logs;
'processing/add_ports': value => $add_ports;
@ -513,12 +512,6 @@ class ironic::inspector (
rabbit_quorum_max_memory_bytes => $rabbit_quorum_max_memory_bytes,
}
if $dnsmasq_interface != 'br-ctlplane' {
warning("The [pxe] dnsmasq_interface option may not be configured by this class \
in a future release. Make sure the ironic::inspector::pxe_filter::iptables class is \
included in the manifest")
}
# Install package
package { 'ironic-inspector':
ensure => $package_ensure,

7
manifests/inspector/pxe_filter/iptables.pp
View File

@ -36,13 +36,8 @@ class ironic::inspector::pxe_filter::iptables (
include ironic::deps
include ironic::inspector
# TODO(tkajinam): Remove usage of ensure_resource once we drop the same
# option from ironic::inspector
ensure_resource('ironic_inspector_config', 'iptables/dnsmasq_interface', {
value => $::ironic::inspector::dnsmasq_interface
})
ironic_inspector_config {
'iptables/dnsmasq_interface': value => $::ironic::inspector::dnsmasq_interface;
'iptables/firewall_chain': value => $firewall_chain;
'iptables/ethoib_interfaces': value => join(any2array($ethoib_interfaces), ',');
'iptables/ip_version': value => $ip_version;

5
releasenotes/notes/dnsmasq_interface-pxe_filter-class-70b838267e618143.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Now the ``[pxe] dnsmasq_interface`` option is managed by only
the ``ironic::inspector::pxe_filter::iptables`` class.

1
spec/classes/ironic_inspector_spec.rb
View File

@ -115,7 +115,6 @@ describe 'ironic::inspector' do
is_expected.to contain_ironic_inspector_config('DEFAULT/timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('DEFAULT/api_max_limit').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('capabilities/boot_mode').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('iptables/dnsmasq_interface').with_value(p[:dnsmasq_interface])
is_expected.to contain_ironic_inspector_config('processing/ramdisk_logs_dir').with_value(p[:ramdisk_logs_dir])
is_expected.to contain_ironic_inspector_config('processing/always_store_ramdisk_logs').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('processing/add_ports').with_value(p[:add_ports])