openstack/python-glanceclient
Code Issues Proposed changes

Update --location help to reference swift store.

Browse Source 
Fixes bug 1085575.

Change-Id: I6b325874a21e63fa02fe261f19e3d071f2b220d9
This commit is contained in:
Brian Waldon
2012-12-03 15:00:46 -08:00
parent 7be3395c6c
commit 2500e69b22
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
glanceclient/v1/shell.py
View File

@@ -166,10 +166,9 @@ def do_image_download(gc, args):
@utils.arg('--min-ram', metavar='<DISK_RAM>', @utils.arg('--min-ram', metavar='<DISK_RAM>',
help='Minimum amount of ram needed to boot image (in megabytes).') help='Minimum amount of ram needed to boot image (in megabytes).')
@utils.arg('--location', metavar='<IMAGE_URL>', @utils.arg('--location', metavar='<IMAGE_URL>',
help=('URL where the data for this image already resides.' help=('URL where the data for this image already resides. For '
' For example, if the image data is stored in the filesystem' 'example, if the image data is stored in swift, you could '
' local to the glance server at \'/usr/share/image.tar.gz\',' 'specify \'swift://account:key@example.com/container/obj\'.'))
' you would specify \'file:///usr/share/image.tar.gz\'.'))
@utils.arg('--file', metavar='<FILE>', @utils.arg('--file', metavar='<FILE>',
help=('Local file that contains disk image to be uploaded during' help=('Local file that contains disk image to be uploaded during'
' creation. Alternatively, images can be passed to the client' ' creation. Alternatively, images can be passed to the client'
@@ -236,10 +235,9 @@ def do_image_create(gc, args):
@utils.arg('--min-ram', metavar='<DISK_RAM>', @utils.arg('--min-ram', metavar='<DISK_RAM>',
help='Minimum amount of ram needed to boot image (in megabytes).') help='Minimum amount of ram needed to boot image (in megabytes).')
@utils.arg('--location', metavar='<IMAGE_URL>', @utils.arg('--location', metavar='<IMAGE_URL>',
help=('URL where the data for this image already resides.' help=('URL where the data for this image already resides. For '
' For example, if the image data is stored in the filesystem' 'example, if the image data is stored in swift, you could '
' local to the glance server at \'/usr/share/image.tar.gz\',' 'specify \'swift://account:key@example.com/container/obj\'.'))
' you would specify \'file:///usr/share/image.tar.gz\'.'))
@utils.arg('--file', metavar='<FILE>', @utils.arg('--file', metavar='<FILE>',
help=('Local file that contains disk image to be uploaded during' help=('Local file that contains disk image to be uploaded during'
' update. Alternatively, images can be passed to the client' ' update. Alternatively, images can be passed to the client'