Merge "Permit Ironic to notify IPA it can support MD5"
This commit is contained in:
commit
9f7218243b
@ -59,6 +59,7 @@ def config(token):
|
|||||||
# explicit True statement for newer agents to lock the setting
|
# explicit True statement for newer agents to lock the setting
|
||||||
# and behavior into place.
|
# and behavior into place.
|
||||||
'agent_token_required': True,
|
'agent_token_required': True,
|
||||||
|
'agent_md5_checksum_enable': CONF.agent.allow_md5_checksum,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -163,6 +163,12 @@ opts = [
|
|||||||
help=_('Path to the TLS CA that is used to start the bare '
|
help=_('Path to the TLS CA that is used to start the bare '
|
||||||
'metal API. In some boot methods this file can be '
|
'metal API. In some boot methods this file can be '
|
||||||
'passed to the ramdisk.')),
|
'passed to the ramdisk.')),
|
||||||
|
cfg.BoolOpt('allow_md5_checksum',
|
||||||
|
default=True,
|
||||||
|
help=_('When enabled, the agent will be notified it is '
|
||||||
|
'permitted to consider MD5 checksums. This option '
|
||||||
|
'is expected to change to a default of False in a '
|
||||||
|
'2024 release of Ironic.')),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
@ -80,6 +80,7 @@ class TestLookup(test_api_base.BaseApiTest):
|
|||||||
'heartbeat_timeout': CONF.api.ramdisk_heartbeat_timeout,
|
'heartbeat_timeout': CONF.api.ramdisk_heartbeat_timeout,
|
||||||
'agent_token': mock.ANY,
|
'agent_token': mock.ANY,
|
||||||
'agent_token_required': True,
|
'agent_token_required': True,
|
||||||
|
'agent_md5_checksum_enable': CONF.agent.allow_md5_checksum,
|
||||||
}
|
}
|
||||||
self.assertEqual(expected_config, data['config'])
|
self.assertEqual(expected_config, data['config'])
|
||||||
self.assertIsNotNone(data['config']['agent_token'])
|
self.assertIsNotNone(data['config']['agent_token'])
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Adds a ``[agent]allow_md5_checksum`` configuration
|
||||||
|
option which can be used to tell ``ironic-python-agent`` versions
|
||||||
|
newer than version ``9.4.0`` if MD5 is a permitted algorithm.
|
Loading…
Reference in New Issue
Block a user