Stop setting boot_option=local on ironic nodes
This is now the default in ironic on tripleo and redundant. Change-Id: I4047298ac5af8a0314ace343518f695144073ff5 Depends-On: I249a1a9e30c06ea15b487e952b91949c606423c5 Related-Bug: #1803965
This commit is contained in:
parent
09c8b52a40
commit
4b3fc8479f
|
@ -370,7 +370,7 @@ class TestImportNode(fakes.TestOvercloudNode):
|
|||
]
|
||||
|
||||
def _check_workflow_call(self, parsed_args, introspect=False,
|
||||
provide=False, local=True, no_deploy_image=False):
|
||||
provide=False, local=None, no_deploy_image=False):
|
||||
self.websocket.wait_for_messages.return_value = [{
|
||||
"status": "SUCCESS",
|
||||
"message": "Success",
|
||||
|
@ -390,7 +390,8 @@ class TestImportNode(fakes.TestOvercloudNode):
|
|||
'kernel_name': None if no_deploy_image else 'bm-deploy-kernel',
|
||||
'ramdisk_name': (None
|
||||
if no_deploy_image else 'bm-deploy-ramdisk'),
|
||||
'instance_boot_option': 'local' if local else 'netboot'
|
||||
'instance_boot_option': ('local' if local is True else
|
||||
'netboot' if local is False else None)
|
||||
}
|
||||
)]
|
||||
|
||||
|
@ -522,7 +523,7 @@ class TestImportNodeMultiArch(fakes.TestOvercloudNode):
|
|||
]
|
||||
|
||||
def _check_workflow_call(self, parsed_args, introspect=False,
|
||||
provide=False, local=True, no_deploy_image=False):
|
||||
provide=False, local=None, no_deploy_image=False):
|
||||
self.websocket.wait_for_messages.return_value = [{
|
||||
"status": "SUCCESS",
|
||||
"message": "Success",
|
||||
|
@ -548,7 +549,8 @@ class TestImportNodeMultiArch(fakes.TestOvercloudNode):
|
|||
'kernel_name': None if no_deploy_image else 'bm-deploy-kernel',
|
||||
'ramdisk_name': (None
|
||||
if no_deploy_image else 'bm-deploy-ramdisk'),
|
||||
'instance_boot_option': 'local' if local else 'netboot'
|
||||
'instance_boot_option': ('local' if local is True else
|
||||
'netboot' if local is False else None)
|
||||
}
|
||||
)]
|
||||
|
||||
|
|
|
@ -668,8 +668,8 @@ def assign_and_verify_profiles(bm_client, flavors,
|
|||
)
|
||||
log.error(
|
||||
"Recommendation: tag more nodes using ironic node-update "
|
||||
"<NODE ID> replace properties/capabilities=profile:%s,"
|
||||
"boot_option:local", profile)
|
||||
"<NODE ID> replace properties/capabilities=profile:%s,",
|
||||
profile)
|
||||
predeploy_errors += 1
|
||||
|
||||
nodes_without_profile = [uu for uu, caps in free_node_caps.items()
|
||||
|
|
|
@ -235,7 +235,7 @@ class ImportNode(command.Command):
|
|||
help=_('Skip setting the deploy kernel and '
|
||||
'ramdisk.'))
|
||||
parser.add_argument('--instance-boot-option',
|
||||
choices=['local', 'netboot'], default='local',
|
||||
choices=['local', 'netboot'], default=None,
|
||||
help=_('Whether to set instances for booting from '
|
||||
'local hard drive (local) or network '
|
||||
'(netboot).'))
|
||||
|
|
Loading…
Reference in New Issue