test_instances_with_cinder_volumes: Delay attaching volumes

Change-Id: Ide4a711aec8aaaee33cd224eba92d112e92cbfba
diff --git a/tempest/scenario/test_instances_with_cinder_volumes.py b/tempest/scenario/test_instances_with_cinder_volumes.py
index 0ddbec1..b2c0501 100644
--- a/tempest/scenario/test_instances_with_cinder_volumes.py
+++ b/tempest/scenario/test_instances_with_cinder_volumes.py
@@ -149,18 +149,6 @@
             waiters.wait_for_server_status(self.servers_client,
                                            server['id'], 'ACTIVE')
 
-            # attach volumes to the instances
-            for volume in created_volumes[start:end]:
-
-                # wait for volume to become available
-                waiters.wait_for_volume_resource_status(
-                    self.volumes_client, volume['id'], 'available')
-
-                attached_volume = self.nova_volume_attach(server, volume)
-                attached_volumes.append(attached_volume)
-                LOG.debug("Attached volume %s to server %s",
-                          attached_volume['id'], server['id'])
-
             # assign floating ip
             floating_ip = None
             if (CONF.network_feature_enabled.floating_ips and
@@ -181,6 +169,18 @@
                 server=server
             )
 
+            # attach volumes to the instances
+            for volume in created_volumes[start:end]:
+
+                # wait for volume to become available
+                waiters.wait_for_volume_resource_status(
+                    self.volumes_client, volume['id'], 'available')
+
+                attached_volume = self.nova_volume_attach(server, volume)
+                attached_volumes.append(attached_volume)
+                LOG.debug("Attached volume %s to server %s",
+                          attached_volume['id'], server['id'])
+
             server_name = server['name'].split('-')[-1]
 
             # run write test on all volumes