diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-24 15:30:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-24 15:30:08 +0000 |
| commit | 1ef0dae8b1347d78cecec8007031679e7315f77b (patch) | |
| tree | cef0e7bb9a0cbd776f5c9a84d43f58099e47ad10 /doc/source/command-objects | |
| parent | 11ef43da495a7d9f6b36c095457e945070dfa38d (diff) | |
| parent | 80c62021c829ceb878b8d51cedeca6fd6c688dd0 (diff) | |
| download | python-openstackclient-1ef0dae8b1347d78cecec8007031679e7315f77b.tar.gz | |
Merge "Update container format choices"
Diffstat (limited to 'doc/source/command-objects')
| -rw-r--r-- | doc/source/command-objects/image.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst index 999842af..7a9ead5c 100644 --- a/doc/source/command-objects/image.rst +++ b/doc/source/command-objects/image.rst @@ -76,7 +76,8 @@ Create/upload an image .. option:: --container-format <container-format> - Image container format (default: bare) + Image container format. The supported options are: ami, ari, aki, + bare, docker, ova, ovf. The default format is: bare .. option:: --disk-format <disk-format> @@ -342,7 +343,8 @@ Set image properties .. option:: --container-format <container-format> - Image container format (default: bare) + Image container format. The supported options are: ami, ari, aki, + bare, docker, ova, ovf. .. option:: --disk-format <disk-format> |