diff --git a/etc/glance-image-import.conf.sample b/etc/glance-image-import.conf.sample index fd27ad03..10860966 100644 --- a/etc/glance-image-import.conf.sample +++ b/etc/glance-image-import.conf.sample @@ -20,7 +20,7 @@ # Possible values: # * qcow2 # * raw -# * vdmk +# * vmdk # # Related Options: # * disk_formats @@ -28,7 +28,7 @@ # Possible values: # qcow2 - # raw - -# vdmk - +# vmdk - #output_format = raw diff --git a/glance/async/flows/plugins/image_conversion.py b/glance/async/flows/plugins/image_conversion.py index 1d7adcf5..c9dc6185 100644 --- a/glance/async/flows/plugins/image_conversion.py +++ b/glance/async/flows/plugins/image_conversion.py @@ -32,7 +32,7 @@ LOG = logging.getLogger(__name__) conversion_plugin_opts = [ cfg.StrOpt('output_format', default='raw', - choices=('qcow2', 'raw', 'vdmk'), + choices=('qcow2', 'raw', 'vmdk'), help=_(""" Desired output format for image conversion plugin. @@ -46,7 +46,7 @@ the conversion and import will fail. Possible values: * qcow2 * raw - * vdmk + * vmdk Related Options: * disk_formats diff --git a/glance/locale/en_GB/LC_MESSAGES/glance.po b/glance/locale/en_GB/LC_MESSAGES/glance.po index b579425e..42898dfa 100644 --- a/glance/locale/en_GB/LC_MESSAGES/glance.po +++ b/glance/locale/en_GB/LC_MESSAGES/glance.po @@ -750,7 +750,7 @@ msgid "" "Possible values:\n" " * qcow2\n" " * raw\n" -" * vdmk\n" +" * vmdk\n" "\n" "Related Options:\n" " * disk_formats\n" @@ -768,7 +768,7 @@ msgstr "" "Possible values:\n" " * qcow2\n" " * raw\n" -" * vdmk\n" +" * vmdk\n" "\n" "Related Options:\n" " * disk_formats\n"