Merge "Follow-up to API version setting"

This commit is contained in:
Zuul
2020-11-02 11:48:22 +00:00
committed by Gerrit Code Review
2 changed files with 10 additions and 7 deletions

View File

@@ -284,10 +284,13 @@ cli_opts = [
'connection when downloading an image.'), 'connection when downloading an image.'),
cfg.StrOpt('ironic_api_version', cfg.StrOpt('ironic_api_version',
default=APARAMS.get('ipa-ironic-api-version', None), default=APARAMS.get('ipa-ironic-api-version', None),
help='Ironic API version in format "x.x". If not set, version ' help='Ironic API version in format "x.x". If not set, the API '
'will be auto-detected. This is not a recommended ' 'version will be auto-detected. Defining an API version '
'configuration.') 'using this setting is not advisiable nor recommended as '
'it blocks auto-detection of the API version. '
'This is an advanced override setting which may only '
'be useful if the environment requires API version '
'auto-detection to be disabled or blocked.'),
] ]
CONF.register_cli_opts(cli_opts) CONF.register_cli_opts(cli_opts)

View File

@@ -2,6 +2,6 @@
features: features:
- | - |
Deployers in highly-secure environments can now manually set Ironic API Deployers in highly-secure environments can now manually set Ironic API
version instead of relying on unauthentication autodetection via version instead of relying on unauthenticated autodetection via
ipa-ironic-api-version on the kernel command line. This is not a the ``ipa-ironic-api-version`` on the kernel command line. This is not a
reccomended configuration. recommended configuration.