openstack/glance
Code Issues Proposed changes

Fixes bug 997565.

Browse Source 
Modified the help text for 'add' image command.

Change-Id: I32cbd36a3a4ef6368f9128ac0ab4a8efbd14ff2e
This commit is contained in:
Unmesh Gurjar 2012-05-10 16:29:24 +05:30
parent 7f761e16ce
commit a857842368
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/glance
View File

@ -173,10 +173,14 @@ is_public Optional. If specified, interpreted as a boolean value
protected Optional. If specified, interpreted as a boolean value protected Optional. If specified, interpreted as a boolean value
and enables or disables deletion protection. and enables or disables deletion protection.
The default value is False. The default value is False.
disk_format Required. Possible values are 'ami','ari','aki', 'vhd', disk_format Required. If unspecified and container_format is specified
'vmk', 'raw', 'qcow2' and 'vdi'. as 'ami', 'ari' or 'aki', disk_format will default to the
container_format Required. Possible values are 'ami', 'ari', 'aki' 'bare' container_format value. Possible values are 'ami', 'ari',
and 'ovf'. 'aki', 'vhd', 'vmk', 'raw', 'qcow2' and 'vdi'.
container_format Required. If unspecified and disk_format is specified as
'ami', 'ari' or 'aki', container_format will default to the
disk_format value. Possible values are 'ami', 'ari', 'aki',
'bare' and 'ovf'.
location Optional. When specified, should be a readable location location Optional. When specified, should be a readable location
in the form of a URI: $STORE://LOCATION. For example, if in the form of a URI: $STORE://LOCATION. For example, if
the image data is stored in a file on the local the image data is stored in a file on the local

4
doc/source/glance.rst
View File

@ -229,7 +229,9 @@ Here is how we'd upload this image to Glance::
container_format=bare disk_format=qcow2 < /tmp/images/myimage.img container_format=bare disk_format=qcow2 < /tmp/images/myimage.img
Note that the disk container formats are no longer defaulted and are thus Note that the disk container formats are no longer defaulted and are thus
strictly required. strictly required. However, if only one of disk or container format is specified
and is in Amazon format, the other parameter defaults to the specified
disk or container format value.
If Glance was able to successfully upload and store your VM image data and If Glance was able to successfully upload and store your VM image data and
metadata attributes, you would see something like this:: metadata attributes, you would see something like this::