diff options
Diffstat (limited to 'glanceclient/v1')
-rw-r--r-- | glanceclient/v1/client.py | 4 | ||||
-rw-r--r-- | glanceclient/v1/shell.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/glanceclient/v1/client.py b/glanceclient/v1/client.py index 668ccfb..68c2a33 100644 --- a/glanceclient/v1/client.py +++ b/glanceclient/v1/client.py @@ -29,10 +29,10 @@ class Client(object): http requests. (optional) """ - def __init__(self, endpoint, *args, **kwargs): + def __init__(self, endpoint, **kwargs): """Initialize a new client for the Images v1 API.""" endpoint, version = utils.strip_version(endpoint) self.version = version or 1.0 - self.http_client = http.HTTPClient(endpoint, *args, **kwargs) + self.http_client = http.HTTPClient(endpoint, **kwargs) self.images = ImageManager(self.http_client) self.image_members = ImageMemberManager(self.http_client) diff --git a/glanceclient/v1/shell.py b/glanceclient/v1/shell.py index 286d2a8..692f9bc 100644 --- a/glanceclient/v1/shell.py +++ b/glanceclient/v1/shell.py @@ -282,7 +282,8 @@ def _is_image_data_provided(args): 'example, if the image data is stored in swift, you could ' 'specify \'swift+http://tenant%%3Aaccount:key@auth_url/' 'v2.0/container/obj\'. ' - '(Note: \'%%3A\' is \':\' URL encoded.)')) + '(Note: \'%%3A\' is \':\' URL encoded.) ' + 'This option only works for images in \'queued\' status.')) @utils.arg('--file', metavar='<FILE>', help=('Local file that contains disk image to be uploaded during' ' update. Alternatively, images can be passed to the client' @@ -292,7 +293,8 @@ def _is_image_data_provided(args): @utils.arg('--copy-from', metavar='<IMAGE_URL>', 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.')) + ' store it in its configured image store.' + ' This option only works for images in \'queued\' status.')) @utils.arg('--is-public', type=_bool_strict, metavar='{True,False}', help='Make image accessible to the public.') |