diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-25 18:06:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-25 18:06:19 +0000 |
| commit | c9730bfcc651498d74d9af05de96304357dc5e28 (patch) | |
| tree | 9cf481cd0a42356fb071771047a7358090cea56b | |
| parent | 28c003dc1179ddb3124fd30c6f525dd341ae9213 (diff) | |
| parent | 4d0a3c309e8404ca94f94c320d63345a7c3b97b2 (diff) | |
| download | python-glanceclient-c9730bfcc651498d74d9af05de96304357dc5e28.tar.gz | |
Merge "help text for container_format, disk_format"
| -rw-r--r-- | glanceclient/v1/shell.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/glanceclient/v1/shell.py b/glanceclient/v1/shell.py index b5ccc93..fff7490 100644 --- a/glanceclient/v1/shell.py +++ b/glanceclient/v1/shell.py @@ -28,8 +28,9 @@ from glanceclient.common import utils from glanceclient import exc import glanceclient.v1.images -CONTAINER_FORMATS = 'Acceptable formats: ami, ari, aki, bare, and ovf.' -DISK_FORMATS = ('Acceptable formats: ami, ari, aki, vhd, vmdk, raw, ' +CONTAINER_FORMATS = ('Acceptable formats: ami, ari, aki, bare, ovf, ova,' + 'docker.') +DISK_FORMATS = ('Acceptable formats: ami, ari, aki, vhd, vdhx, vmdk, raw, ' 'qcow2, vdi, iso, and ploop.') DATA_FIELDS = ('location', 'copy_from', 'file') |