diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-08-19 15:34:56 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-08-19 15:34:56 +0000 |
commit | 20bd548d71097ca96d4e9f841ff68547e477323d (patch) | |
tree | cc87de50d6924258d4bd3b84bcdc6fe0cc427f0f | |
parent | 7e4ba229c3d89392b52eb9dfb260c745cdb821ae (diff) | |
parent | ce8636b6b3c4b606483cfb2bc405d86224f309bc (diff) | |
download | python-glanceclient-20bd548d71097ca96d4e9f841ff68547e477323d.tar.gz |
Merge "removed deprecated parameter --public"
-rw-r--r-- | glanceclient/v1/shell.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/glanceclient/v1/shell.py b/glanceclient/v1/shell.py index 31c507b..3da0431 100644 --- a/glanceclient/v1/shell.py +++ b/glanceclient/v1/shell.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import argparse import copy import os import sys @@ -211,10 +210,6 @@ def do_image_download(gc, args): help=('Similar to \'--location\' in usage, but this indicates that' ' the Glance server should immediately copy the data and' ' store it in its configured image store.')) -#NOTE(bcwaldon): This will be removed once devstack is updated -# to use --is-public -@utils.arg('--public', action='store_true', default=False, - help=argparse.SUPPRESS) @utils.arg('--is-public', type=utils.string_to_bool, metavar='[True|False]', help='Make image accessible to the public.') @utils.arg('--is-protected', type=utils.string_to_bool, metavar='[True|False]', @@ -231,7 +226,7 @@ def do_image_create(gc, args): # Filter out None values fields = dict(filter(lambda x: x[1] is not None, vars(args).items())) - fields['is_public'] = fields.get('is_public') or fields.pop('public') + fields['is_public'] = fields.get('is_public') if 'is_protected' in fields: fields['protected'] = fields.pop('is_protected') |