Merge "Only use undercloud.conf ipxe_enabled for inspection" into stable/wallaby
This commit is contained in:
commit
67c695909d
@ -284,8 +284,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',
|
||||
|
@ -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',
|
||||
|
Loading…
Reference in New Issue
Block a user