diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index a7c8fb7..15369de 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -3,6 +3,21 @@
 Tempest Configuration Guide
 ===========================
 
+This guide is a starting point for configuring tempest. It aims to elaborate
+on and explain some of the mandatory and common configuration settings and how
+they are used in conjunction. The source of truth on each option is the sample
+config file which explains the purpose of each individual option.
+
+Lock Path
+---------
+
+There are some tests and operations inside of tempest that need to be
+externally locked when running in parallel to prevent them from running at
+the same time. This is a mandatory step for configuring tempest and is still
+needed even when running serially. All that is needed to do this is:
+
+ #. Set the lock_path option in the oslo_concurrency group
+
 Auth/Credentials
 ----------------
 
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',