Merge "Only use undercloud.conf ipxe_enabled for inspection"

This commit is contained in:
Zuul 2021-06-26 23:04:35 +00:00 committed by Gerrit Code Review
commit b80e1332db
2 changed files with 3 additions and 5 deletions

View File

@ -286,8 +286,7 @@ class UndercloudConfig(StandaloneConfig):
),
cfg.BoolOpt('ipxe_enabled',
default=True,
help=_('Whether to use iPXE for deploy and '
'inspection.'),
help=_('Whether to use iPXE for inspection.'),
deprecated_name='ipxe_deploy',
),
cfg.IntOpt('scheduler_max_attempts',

View File

@ -56,12 +56,11 @@ INSTACK_NETCONF_MAPPING = {
'SUBNETS_STATIC_ROUTES': 'ControlPlaneStaticRoutes',
}
MULTI_PARAMETER_MAPPING = {
'ipxe_enabled': ['IronicIPXEEnabled', 'IronicInspectorIPXEEnabled']
}
MULTI_PARAMETER_MAPPING = {}
PARAMETER_MAPPING = {
'inspection_interface': 'IronicInspectorInterface',
'ipxe_enabled': 'IronicInspectorIPXEEnabled',
'undercloud_debug': 'Debug',
'certificate_generation_ca': 'CertmongerCA',
'undercloud_public_host': 'CloudName',