diff --git a/shade/__init__.py b/shade/__init__.py
index c8decc6dc..3db3c41b6 100644
--- a/shade/__init__.py
+++ b/shade/__init__.py
@@ -2328,7 +2328,9 @@ class OpenStackCloud(object):
 
         return self.get_floating_ip(id=f_ip['id'])
 
-    def add_ips_to_server(self, server, auto_ip=True, ips=None, ip_pool=None):
+    def add_ips_to_server(
+            self, server, auto_ip=True, ips=None, ip_pool=None,
+            wait=False, timeout=60):
         if ip_pool:
             self.add_ip_from_pool(server['id'], ip_pool)
         elif ips:
@@ -2336,7 +2338,7 @@ class OpenStackCloud(object):
         elif auto_ip:
             if self.get_server_public_ip(server):
                 return server
-            self.add_auto_ip(server)
+            self.add_auto_ip(server, wait=wait, timeout=timeout)
         else:
             return server
 
diff --git a/shade/tests/unit/test_floating_ip_common.py b/shade/tests/unit/test_floating_ip_common.py
index 82bb9d5f2..a0fcbaf3a 100644
--- a/shade/tests/unit/test_floating_ip_common.py
+++ b/shade/tests/unit/test_floating_ip_common.py
@@ -104,4 +104,5 @@ class TestFloatingIP(base.TestCase):
 
         self.client.add_ips_to_server(server_dict)
 
-        mock_add_auto_ip.assert_called_with(server_dict)
+        mock_add_auto_ip.assert_called_with(
+            server_dict, wait=False, timeout=60)