Merge "Follow up to the API version warning patches"
This commit is contained in:
commit
ca1b923f98
|
@ -85,7 +85,9 @@ def build_option_parser(parser):
|
||||||
help='Baremetal API version, default=' +
|
help='Baremetal API version, default=' +
|
||||||
http.DEFAULT_VER +
|
http.DEFAULT_VER +
|
||||||
' (Env: OS_BAREMETAL_API_VERSION). '
|
' (Env: OS_BAREMETAL_API_VERSION). '
|
||||||
'"latest" is the latest known API version',
|
'Use "latest" for the latest known API version. '
|
||||||
|
'The default value will change to "latest" in the Queens '
|
||||||
|
'release.',
|
||||||
)
|
)
|
||||||
return parser
|
return parser
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ from ironicclient import exc
|
||||||
|
|
||||||
LATEST_API_VERSION = ('1', 'latest')
|
LATEST_API_VERSION = ('1', 'latest')
|
||||||
MISSING_VERSION_WARNING = (
|
MISSING_VERSION_WARNING = (
|
||||||
"You are using the default API version of the 'ironic' command "
|
"You are using the default API version of the 'ironic' command. "
|
||||||
"This is currently API version %s. In the future, the default will be "
|
"This is currently API version %s. In the future, the default will be "
|
||||||
"the latest API version understood by both API and CLI. You can preserve "
|
"the latest API version understood by both API and CLI. You can preserve "
|
||||||
"the current behavior by passing the --ironic-api-version argument with "
|
"the current behavior by passing the --ironic-api-version argument with "
|
||||||
|
@ -163,8 +163,10 @@ class IronicShell(object):
|
||||||
default=cliutils.env('IRONIC_API_VERSION',
|
default=cliutils.env('IRONIC_API_VERSION',
|
||||||
default=None),
|
default=None),
|
||||||
help=_('Accepts 1.x (where "x" is microversion) '
|
help=_('Accepts 1.x (where "x" is microversion) '
|
||||||
'or "latest", Defaults to '
|
'or "latest". Defaults to '
|
||||||
'env[IRONIC_API_VERSION] or 1'))
|
'env[IRONIC_API_VERSION] or %s. Starting '
|
||||||
|
'with the Queens release this will '
|
||||||
|
'default to "latest".') % http.DEFAULT_VER)
|
||||||
|
|
||||||
parser.add_argument('--ironic_api_version',
|
parser.add_argument('--ironic_api_version',
|
||||||
help=argparse.SUPPRESS)
|
help=argparse.SUPPRESS)
|
||||||
|
|
Loading…
Reference in New Issue