diff --git a/manifests/inspector.pp b/manifests/inspector.pp index a227c713..141b9405 100644 --- a/manifests/inspector.pp +++ b/manifests/inspector.pp @@ -235,12 +235,6 @@ # transport://user:pass@host1:port[,hostN:portN]/virtual_host # Defaults to 'fake://' # -## DEPRECATED PARAMS -# -# [*debug*] -# (optional) Enable debug logging -# Defaults to undef -# class ironic::inspector ( $package_ensure = 'present', $enabled = true, @@ -290,8 +284,6 @@ class ironic::inspector ( $discovery_default_driver = $::os_service_default, $enable_ppc64le = false, $default_transport_url = 'fake://', - ## DEPRECATED PARAMS - $debug = undef, ) { include ::ironic::deps @@ -307,10 +299,6 @@ class ironic::inspector ( fail('Invalid data type, parameter dnsmasq_ip_subnets must be Array type') } - # TODO(tobias-urdin): When debug is removed make sure this is removed - # and change dhcp_debug_real to dhcp_debug in the erb templates. - $dhcp_debug_real = pick($debug, $dhcp_debug) - $tftp_root_real = pick($::ironic::pxe::common::tftp_root, $tftp_root) $http_root_real = pick($::ironic::pxe::common::http_root, $http_root) $http_port_real = pick($::ironic::pxe::common::http_port, $http_port) diff --git a/releasenotes/notes/remove-inspector-debug-62a7295112860c54.yaml b/releasenotes/notes/remove-inspector-debug-62a7295112860c54.yaml new file mode 100644 index 00000000..b1e2b51a --- /dev/null +++ b/releasenotes/notes/remove-inspector-debug-62a7295112860c54.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The deprecated ironic::inspector::debug is removed, please use the dhcp_debug parameter. diff --git a/templates/inspector_dnsmasq_http.erb b/templates/inspector_dnsmasq_http.erb index ebfc0cfc..4c4ed8f4 100644 --- a/templates/inspector_dnsmasq_http.erb +++ b/templates/inspector_dnsmasq_http.erb @@ -1,6 +1,6 @@ port=0 interface=<%= @dnsmasq_interface %> -<% if @dhcp_debug_real %> +<% if @dhcp_debug %> log-dhcp log-queries <% end %> diff --git a/templates/inspector_dnsmasq_tftp.erb b/templates/inspector_dnsmasq_tftp.erb index 2f8041d3..a0ac56bb 100644 --- a/templates/inspector_dnsmasq_tftp.erb +++ b/templates/inspector_dnsmasq_tftp.erb @@ -1,6 +1,6 @@ port=0 interface=<%= @dnsmasq_interface %> -<% if @dhcp_debug_real %> +<% if @dhcp_debug %> log-dhcp log-queries <% end %>