summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2018-02-21 09:10:58 -0500
committerAlex Schultz <aschultz@redhat.com>2018-03-05 21:52:56 +0000
commitdd059502858a17e82344d8f2a46a9ff38bd59147 (patch)
tree87beb754ceb9d83bc87751d270100378c246833e
parentce5dc7f4bd07c565d15d960b986952fad9a10273 (diff)
Drop inspection_enable_uefi option
This has been unsupported since 2016's puppet-ironic commit here: I0f242a7e1c28c4007b3c2d955dbd3b29086e92f1 Change-Id: Ic219fcdf2695c08b629015a0c387629d01f86a20
Notes
Notes (review): Code-Review+2: Dmitry Tantsur <divius.inside@gmail.com> Code-Review+2: Emilien Macchi <emilien@redhat.com> Workflow+1: Alex Schultz <aschultz@redhat.com> Verified+1: RDO Third Party CI <dmsimard+rdothirdparty@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 06 Mar 2018 20:31:01 +0000 Reviewed-on: https://review.openstack.org/546644 Project: openstack/instack-undercloud Branch: refs/heads/master
-rw-r--r--elements/puppet-stack-config/puppet-stack-config.yaml.template1
-rw-r--r--instack_undercloud/undercloud.py5
-rw-r--r--undercloud.conf.sample4
3 files changed, 0 insertions, 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 0b56004..1b1c834 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')}"
548{{#IPXE_ENABLED}} 548{{#IPXE_ENABLED}}
549ironic::inspector::pxe_transfer_protocol: 'http' 549ironic::inspector::pxe_transfer_protocol: 'http'
550{{/IPXE_ENABLED}} 550{{/IPXE_ENABLED}}
551ironic::inspector::enable_uefi: {{INSPECTION_ENABLE_UEFI}}
552ironic::inspector::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}" 551ironic::inspector::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}"
553ironic::inspector::authtoken::auth_url: "%{hiera('keystone_identity_uri')}" 552ironic::inspector::authtoken::auth_url: "%{hiera('keystone_identity_uri')}"
554ironic::inspector::authtoken::username: 'ironic' 553ironic::inspector::authtoken::username: 'ironic'
diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
index aec1a51..4b8a8e8 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -294,11 +294,6 @@ _opts = [
294 help=('Whether to run benchmarks when inspecting nodes. ' 294 help=('Whether to run benchmarks when inspecting nodes. '
295 'Requires inspection_extras set to True.') 295 'Requires inspection_extras set to True.')
296 ), 296 ),
297 cfg.BoolOpt('inspection_enable_uefi',
298 default=True,
299 help=('Whether to support introspection of nodes that have '
300 'UEFI-only firmware.')
301 ),
302 cfg.BoolOpt('enable_node_discovery', 297 cfg.BoolOpt('enable_node_discovery',
303 default=False, 298 default=False,
304 help=('Makes ironic-inspector enroll any unknown node that ' 299 help=('Makes ironic-inspector enroll any unknown node that '
diff --git a/undercloud.conf.sample b/undercloud.conf.sample
index cce02b2..d3dea9a 100644
--- a/undercloud.conf.sample
+++ b/undercloud.conf.sample
@@ -140,10 +140,6 @@
140# Deprecated group/name - [DEFAULT]/discovery_runbench 140# Deprecated group/name - [DEFAULT]/discovery_runbench
141#inspection_runbench = false 141#inspection_runbench = false
142 142
143# Whether to support introspection of nodes that have UEFI-only
144# firmware. (boolean value)
145#inspection_enable_uefi = true
146
147# Makes ironic-inspector enroll any unknown node that PXE-boots 143# Makes ironic-inspector enroll any unknown node that PXE-boots
148# introspection ramdisk in Ironic. By default, the "fake" driver is 144# introspection ramdisk in Ironic. By default, the "fake" driver is
149# used for new nodes (it is automatically enabled when this option is 145# used for new nodes (it is automatically enabled when this option is