commit 7473aca1c1496f26ca0201af338ce605c88ce06f
author Jenkins <jenkins@review.openstack.org> Mon Mar 16 11:15:27 2015 +0000
committer Gerrit Code Review <review@openstack.org> Mon Mar 16 11:15:27 2015 +0000
tree 9615d48499392ed7ebfd87daf2e1c7c79236ce63
parent 7b47b778be8288af57f677aba3a10ef30a1abeeb
parent f74c94bc9309b5d4e3e5aa7c43a28fee65cd373a

Merge "javelin: add missing network_name in destroy_servers loop"

tempest/cmd/javelin.py

diff --git a/tempest/cmd/javelin.py b/tempest/cmd/javelin.py
index 8f238a5..ab23dea 100755
--- a/tempest/cmd/javelin.py
+++ b/tempest/cmd/javelin.py
@@ -882,7 +882,7 @@
             if (CONF.service_available.neutron and
                     not CONF.baremetal.driver_enabled and
                     CONF.compute.use_floatingip_for_ssh):
-                for body in res['addresses'].items():
+                for network_name, body in res['addresses'].items():
                     for addr in body:
                         ip = addr['addr']
                         if addr.get('OS-EXT-IPS:type',