From 2500e69b22c7291d1a01e86145ddfca87277ecd0 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Mon, 3 Dec 2012 15:00:46 -0800 Subject: [PATCH] Update --location help to reference swift store. Fixes bug 1085575. Change-Id: I6b325874a21e63fa02fe261f19e3d071f2b220d9 --- glanceclient/v1/shell.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/glanceclient/v1/shell.py b/glanceclient/v1/shell.py index 43eb420a..4423e7cf 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='', help='Minimum amount of ram needed to boot image (in megabytes).') @utils.arg('--location', metavar='', - 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='', 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='', help='Minimum amount of ram needed to boot image (in megabytes).') @utils.arg('--location', metavar='', - 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='', help=('Local file that contains disk image to be uploaded during' ' update. Alternatively, images can be passed to the client'