diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-24 19:51:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-24 19:51:30 +0000 |
| commit | 55d9eba0937944119e6209c85005980c7297d123 (patch) | |
| tree | cabac6840cde898651a0393deb60b6b36e370e82 /openstackclient/object | |
| parent | 46cc7d12ad202184917822dfa16dc66d066c8538 (diff) | |
| parent | b3335b3474e559d8afb0b7f86796fbb68a0687a8 (diff) | |
| download | python-openstackclient-55d9eba0937944119e6209c85005980c7297d123.tar.gz | |
Merge "Do not set default versions in parsed args"
Diffstat (limited to 'openstackclient/object')
| -rw-r--r-- | openstackclient/object/client.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/openstackclient/object/client.py b/openstackclient/object/client.py index 0359940d..e7587802 100644 --- a/openstackclient/object/client.py +++ b/openstackclient/object/client.py @@ -22,7 +22,7 @@ from openstackclient.common import utils LOG = logging.getLogger(__name__) -DEFAULT_OBJECT_API_VERSION = '1' +DEFAULT_API_VERSION = '1' API_VERSION_OPTION = 'os_object_api_version' API_NAME = 'object_store' API_VERSIONS = { @@ -52,10 +52,8 @@ def build_option_parser(parser): parser.add_argument( '--os-object-api-version', metavar='<object-api-version>', - default=utils.env( - 'OS_OBJECT_API_VERSION', - default=DEFAULT_OBJECT_API_VERSION), + default=utils.env('OS_OBJECT_API_VERSION'), help='Object API version, default=' + - DEFAULT_OBJECT_API_VERSION + + DEFAULT_API_VERSION + ' (Env: OS_OBJECT_API_VERSION)') return parser |