summaryrefslogtreecommitdiff
path: root/glanceclient/v1/shell.py
diff options
context:
space:
mode:
authorBrian Waldon <bcwaldon@gmail.com>2012-12-03 15:00:46 -0800
committerBrian Waldon <bcwaldon@gmail.com>2012-12-03 15:01:34 -0800
commit2500e69b22c7291d1a01e86145ddfca87277ecd0 (patch)
treede3cc4ca9533c57dd4ba60aa207fc1e90bfdf324 /glanceclient/v1/shell.py
parent7be3395c6c7df3a8404eef199a145d8955382e67 (diff)
downloadpython-glanceclient-2500e69b22c7291d1a01e86145ddfca87277ecd0.tar.gz
Update --location help to reference swift store.
Fixes bug 1085575. Change-Id: I6b325874a21e63fa02fe261f19e3d071f2b220d9
Diffstat (limited to 'glanceclient/v1/shell.py')
-rw-r--r--glanceclient/v1/shell.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/glanceclient/v1/shell.py b/glanceclient/v1/shell.py
index 43eb420..4423e7c 100644
--- a/glanceclient/v1/shell.py
+++ b/glanceclient/v1/shell.py
@@ -166,10 +166,9 @@ def do_image_download(gc, args):
@utils.arg('--min-ram', metavar='<DISK_RAM>',
help='Minimum amount of ram needed to boot image (in megabytes).')
@utils.arg('--location', metavar='<IMAGE_URL>',
- help=('URL where the data for this image already resides.'
- ' For example, if the image data is stored in the filesystem'
- ' local to the glance server at \'/usr/share/image.tar.gz\','
- ' you would specify \'file:///usr/share/image.tar.gz\'.'))
+ help=('URL where the data for this image already resides. For '
+ 'example, if the image data is stored in swift, you could '
+ 'specify \'swift://account:key@example.com/container/obj\'.'))
@utils.arg('--file', metavar='<FILE>',
help=('Local file that contains disk image to be uploaded during'
' 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>',
help='Minimum amount of ram needed to boot image (in megabytes).')
@utils.arg('--location', metavar='<IMAGE_URL>',
- help=('URL where the data for this image already resides.'
- ' For example, if the image data is stored in the filesystem'
- ' local to the glance server at \'/usr/share/image.tar.gz\','
- ' you would specify \'file:///usr/share/image.tar.gz\'.'))
+ help=('URL where the data for this image already resides. For '
+ 'example, if the image data is stored in swift, you could '
+ 'specify \'swift://account:key@example.com/container/obj\'.'))
@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'