commit bd863d30a3cfd10fe5538ed34d7efd30f6766891
author Jenkins <jenkins@review.openstack.org> Wed May 24 10:30:44 2017 +0000
committer Gerrit Code Review <review@openstack.org> Wed May 24 10:30:44 2017 +0000
tree 475e4590ca96c2e000c18f8ba931e5f2ac41b84a
parent 0bb68d712827e850621d00e012876bb75531352c
parent ead5bf61e4a155aa2b037d1518bfcc3144d17d65

Merge "Remove undefined variable in exception message"

tempest/api/image/v1/test_images.py

diff --git a/tempest/api/image/v1/test_images.py b/tempest/api/image/v1/test_images.py
index b341ab7..76723f4 100644
--- a/tempest/api/image/v1/test_images.py
+++ b/tempest/api/image/v1/test_images.py
@@ -43,7 +43,8 @@
         else:
             msg = ("The container format and the disk format don't match. "
                    "Container format: %(container)s, Disk format: %(disk)s." %
-                   {'container': container_format, 'disk': disk_format})
+                   {'container': container_format, 'disk':
+                       CONF.image.disk_formats})
             raise exceptions.InvalidConfiguration(msg)
     else:
         disk_format = CONF.image.disk_formats[0]