Remove ironic::inspector::debug

Removes the deprecated parameter that is superseeded
by the dhcp_debug parameter.

Change-Id: I81dece5bcaf36c0f67d17398f2dd957b06dd2e1b
This commit is contained in:
Tobias Urdin 2019-05-10 16:32:34 +02:00
parent b50b6a085a
commit 39115e63c2
4 changed files with 6 additions and 14 deletions

View File

@ -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)

View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The deprecated ironic::inspector::debug is removed, please use the dhcp_debug parameter.

View File

@ -1,6 +1,6 @@
port=0
interface=<%= @dnsmasq_interface %>
<% if @dhcp_debug_real %>
<% if @dhcp_debug %>
log-dhcp
log-queries
<% end %>

View File

@ -1,6 +1,6 @@
port=0
interface=<%= @dnsmasq_interface %>
<% if @dhcp_debug_real %>
<% if @dhcp_debug %>
log-dhcp
log-queries
<% end %>