Merge "Glance supports vhdx disk_format"
diff --git a/tempest/config.py b/tempest/config.py
index ef67e7d..35eb187 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -505,7 +505,7 @@
                      "users can specify."),
     cfg.ListOpt('disk_formats',
                 default=['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2',
-                         'vdi', 'iso'],
+                         'vdi', 'iso', 'vhdx'],
                 help="A list of image's disk formats "
                      "users can specify.")
 ]