From dd059502858a17e82344d8f2a46a9ff38bd59147 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 21 Feb 2018 09:10:58 -0500 Subject: [PATCH] Drop inspection_enable_uefi option This has been unsupported since 2016's puppet-ironic commit here: I0f242a7e1c28c4007b3c2d955dbd3b29086e92f1 Change-Id: Ic219fcdf2695c08b629015a0c387629d01f86a20 --- .../puppet-stack-config/puppet-stack-config.yaml.template | 1 - instack_undercloud/undercloud.py | 5 ----- undercloud.conf.sample | 4 ---- 3 files changed, 10 deletions(-) diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index 0b5600406..1b1c8344b 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -548,7 +548,6 @@ ironic::inspector::debug: "%{hiera('debug')}" {{#IPXE_ENABLED}} ironic::inspector::pxe_transfer_protocol: 'http' {{/IPXE_ENABLED}} -ironic::inspector::enable_uefi: {{INSPECTION_ENABLE_UEFI}} ironic::inspector::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}" ironic::inspector::authtoken::auth_url: "%{hiera('keystone_identity_uri')}" ironic::inspector::authtoken::username: 'ironic' diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py index aec1a51a8..4b8a8e87a 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py @@ -294,11 +294,6 @@ _opts = [ help=('Whether to run benchmarks when inspecting nodes. ' 'Requires inspection_extras set to True.') ), - cfg.BoolOpt('inspection_enable_uefi', - default=True, - help=('Whether to support introspection of nodes that have ' - 'UEFI-only firmware.') - ), cfg.BoolOpt('enable_node_discovery', default=False, help=('Makes ironic-inspector enroll any unknown node that ' diff --git a/undercloud.conf.sample b/undercloud.conf.sample index cce02b20b..d3dea9a5f 100644 --- a/undercloud.conf.sample +++ b/undercloud.conf.sample @@ -140,10 +140,6 @@ # Deprecated group/name - [DEFAULT]/discovery_runbench #inspection_runbench = false -# Whether to support introspection of nodes that have UEFI-only -# firmware. (boolean value) -#inspection_enable_uefi = true - # Makes ironic-inspector enroll any unknown node that PXE-boots # introspection ramdisk in Ironic. By default, the "fake" driver is # used for new nodes (it is automatically enabled when this option is