Follow up to the API version warning patches

* Update the help string of --ironic-api-version and --os-baremetal-api-version
  to mention the future change.
* Add missing dot to the warning issued by the "ironic" tool.

Partial-Bug: #1671145
Change-Id: Ia03775a318008d0c740ce873ea037309290e33f8
This commit is contained in:
Dmitry Tantsur 2017-07-24 17:58:01 +02:00 committed by Julia Kreger
parent cdae0fb045
commit 324aaa79e3
2 changed files with 8 additions and 4 deletions

View File

@ -85,7 +85,9 @@ def build_option_parser(parser):
help='Baremetal API version, default=' +
http.DEFAULT_VER +
' (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

View File

@ -40,7 +40,7 @@ from ironicclient import exc
LATEST_API_VERSION = ('1', 'latest')
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 "
"the latest API version understood by both API and CLI. You can preserve "
"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=None),
help=_('Accepts 1.x (where "x" is microversion) '
'or "latest", Defaults to '
'env[IRONIC_API_VERSION] or 1'))
'or "latest". Defaults to '
'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',
help=argparse.SUPPRESS)