From a22f02b653399bc495b85db1d6106c0e790edfe7 Mon Sep 17 00:00:00 2001
From: Brian Rosmaita <rosmaita.fossdev@gmail.com>
Date: Fri, 21 Dec 2018 09:29:17 -0500
Subject: [PATCH] Correct typo in config option choices

A typo in the oslo.config 'choices' for the output_format config
option definition for the image conversion plugin in the
interoperable image import workflow prevents conversion to the
vmdk format.  This patch corrects the typo and regenerates the
sample image import conf file.

Change-Id: I1836a46d969aab8ce09967db63d66f215d2cc920
Closes-bug: #1809462
Related-bug: #1805765
---
 etc/glance-image-import.conf.sample             | 8 ++++++--
 glance/async_/flows/plugins/image_conversion.py | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/etc/glance-image-import.conf.sample b/etc/glance-image-import.conf.sample
index fd27ad0303..19a64207e4 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 - <No description provided>
 # raw - <No description provided>
-# vdmk - <No description provided>
+# vmdk - <No description provided>
 #output_format = raw
 
 
@@ -60,6 +60,10 @@
 #     * Any provided Task object name to be included
 #       in to the flow.
 #  (list value)
+#
+# This option has a sample default set, which means that
+# its actual default value may vary from the one documented
+# below.
 #image_import_plugins = [no_op]
 
 
diff --git a/glance/async_/flows/plugins/image_conversion.py b/glance/async_/flows/plugins/image_conversion.py
index b580759c31..3bfbc4a42e 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