diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-06 21:26:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-06 21:26:33 +0000 |
| commit | f6678feea057484f99f1fc3f348945bed99682c4 (patch) | |
| tree | 56104f2b395af6568c2f6a17444b8f5c69d4bb9d /doc/source | |
| parent | be1ee4181ee9e7f8d2eed43d3cb79e50af13e6c8 (diff) | |
| parent | 201b1cee86a4df8ede6c97d962ac331ad0378140 (diff) | |
| download | python-openstackclient-f6678feea057484f99f1fc3f348945bed99682c4.tar.gz | |
Merge "Clean up Image v2 image set command"
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/command-objects/image.rst | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst index d2698b0b..8dce3662 100644 --- a/doc/source/command-objects/image.rst +++ b/doc/source/command-objects/image.rst @@ -238,6 +238,12 @@ Set image properties [--checksum <checksum>] [--stdin] [--property <key=value> [...] ] + [--architecture <architecture>] + [--instance-id <instance-id>] + [--kernel-id <kernel-id>] + [--os-distro <os-distro>] + [--os-version <os-version>] + [--ramdisk-id <ramdisk-id>] <image> .. option:: --name <name> @@ -258,14 +264,11 @@ Set image properties .. option:: --container-format <container-format> - Container format of image. - Acceptable formats: ['ami', 'ari', 'aki', 'bare', 'ovf'] + Image container format (default: bare) .. option:: --disk-format <disk-format> - Disk format of image. - Acceptable formats: ['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', - 'vdi', 'iso'] + Image disk format (default: raw) .. option:: --size <size> @@ -339,45 +342,41 @@ Set image properties .. option:: --property <key=value> - Set a property on this image (repeat for multiple values) - - *Image version 1 only.* + Set a property on this image (repeat option to set multiple properties) .. option:: --architecture <architecture> - Operating system Architecture + Operating system architecture .. versionadded:: 2 -.. option:: --ramdisk-id <ramdisk-id> +.. option:: --instance-id <instance-id> - ID of image stored in Glance that should be used as - the ramdisk when booting an AMI-style image + ID of server instance used to create this image .. versionadded:: 2 -.. option:: --os-distro <os-distro> +.. option:: --kernel-id <kernel-id> - Common name of operating system distribution + ID of kernel image used to boot this disk image .. versionadded:: 2 -.. option:: --os-version <os-version> +.. option:: --os-distro <os-distro> - Operating system version as specified by the distributor + Operating system distribution name .. versionadded:: 2 -.. option:: --kernel-id <kernel-id> +.. option:: --os-version <os-version> - ID of image in Glance that should be used as the - kernel when booting an AMI-style image + Operating system distribution version .. versionadded:: 2 -.. option:: --instance-uuid <instance_uuid> +.. option:: --ramdisk-id <ramdisk-id> - ID of instance used to create this image + ID of ramdisk image used to boot this disk image .. versionadded:: 2 |