Make inspection also respect whether iPXE is enabled
Rename ipxe_deploy to ipxe_enabled and make inspection use it.
Change-Id: Ia3e2a5812e8f0e30664c179cfb1baa31127041d9
Closes-Bug: #1638985
(cherry picked from commit 90f7f548d6
)
This commit is contained in:
parent
632c6433c4
commit
245b5c792c
|
@ -400,7 +400,9 @@ ironic::keystone::auth_inspector::region: "%{hiera('keystone_region')}"
|
|||
# Ironic Inspector
|
||||
ironic::inspector::listen_address: {{LOCAL_IP}}
|
||||
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')}"
|
||||
|
@ -438,7 +440,7 @@ ironic::conductor::http_boot: '/httpboot'
|
|||
ironic::inspector::http_port: "%{hiera('ironic_ipxe_port')}"
|
||||
|
||||
# Ironic pxe
|
||||
ironic::drivers::pxe::ipxe_enabled: {{IPXE_DEPLOY}}
|
||||
ironic::drivers::pxe::ipxe_enabled: {{IPXE_ENABLED}}
|
||||
# NOTE(dtantsur): UEFI only works with iPXE currently for us
|
||||
ironic::drivers::pxe::uefi_pxe_config_template: '$pybasedir/drivers/modules/ipxe_config.template'
|
||||
ironic::drivers::pxe::uefi_pxe_bootfile_name: 'ipxe.efi'
|
||||
|
@ -585,7 +587,6 @@ enable_zaqar: {{ENABLE_ZAQAR}}
|
|||
enable_validations: {{ENABLE_VALIDATIONS}}
|
||||
enable_telemetry: {{ENABLE_TELEMETRY}}
|
||||
enable_ui: {{ENABLE_UI}}
|
||||
ipxe_deploy: {{IPXE_DEPLOY}}
|
||||
|
||||
# Path to install configuration files
|
||||
tripleo_install_user: {{TRIPLEO_INSTALL_USER}}
|
||||
|
|
|
@ -311,9 +311,10 @@ _opts = [
|
|||
help=('Whether to install requirements to run the TripleO '
|
||||
'validations.')
|
||||
),
|
||||
cfg.BoolOpt('ipxe_deploy',
|
||||
cfg.BoolOpt('ipxe_enabled',
|
||||
default=True,
|
||||
help=('Whether to use iPXE for deploy by default.')
|
||||
help=('Whether to use iPXE for deploy and inspection.'),
|
||||
deprecated_name='ipxe_deploy',
|
||||
),
|
||||
cfg.BoolOpt('store_events',
|
||||
default=False,
|
||||
|
|
|
@ -158,8 +158,9 @@
|
|||
# (boolean value)
|
||||
#enable_validations = true
|
||||
|
||||
# Whether to use iPXE for deploy by default. (boolean value)
|
||||
#ipxe_deploy = true
|
||||
# Whether to use iPXE for deploy and inspection. (boolean value)
|
||||
# Deprecated group/name - [DEFAULT]/ipxe_deploy
|
||||
#ipxe_enabled = true
|
||||
|
||||
|
||||
# Whether to store events in the Undercloud Ceilometer. (boolean
|
||||
|
|
Loading…
Reference in New Issue