summaryrefslogtreecommitdiff
path: root/openstackclient/volume
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-24 19:51:30 +0000
committerGerrit Code Review <review@openstack.org>2015-07-24 19:51:30 +0000
commit55d9eba0937944119e6209c85005980c7297d123 (patch)
treecabac6840cde898651a0393deb60b6b36e370e82 /openstackclient/volume
parent46cc7d12ad202184917822dfa16dc66d066c8538 (diff)
parentb3335b3474e559d8afb0b7f86796fbb68a0687a8 (diff)
downloadpython-openstackclient-55d9eba0937944119e6209c85005980c7297d123.tar.gz
Merge "Do not set default versions in parsed args"
Diffstat (limited to 'openstackclient/volume')
-rw-r--r--openstackclient/volume/client.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/openstackclient/volume/client.py b/openstackclient/volume/client.py
index 093178e3..d4800b8d 100644
--- a/openstackclient/volume/client.py
+++ b/openstackclient/volume/client.py
@@ -19,7 +19,7 @@ from openstackclient.common import utils
LOG = logging.getLogger(__name__)
-DEFAULT_VOLUME_API_VERSION = '1'
+DEFAULT_API_VERSION = '1'
API_VERSION_OPTION = 'os_volume_api_version'
API_NAME = "volume"
API_VERSIONS = {
@@ -72,10 +72,8 @@ def build_option_parser(parser):
parser.add_argument(
'--os-volume-api-version',
metavar='<volume-api-version>',
- default=utils.env(
- 'OS_VOLUME_API_VERSION',
- default=DEFAULT_VOLUME_API_VERSION),
+ default=utils.env('OS_VOLUME_API_VERSION'),
help='Volume API version, default=' +
- DEFAULT_VOLUME_API_VERSION +
+ DEFAULT_API_VERSION +
' (Env: OS_VOLUME_API_VERSION)')
return parser