diff --git a/cloud/openstack/os_floating_ip.py b/cloud/openstack/os_floating_ip.py
index d4ea326c98a..ee86c8490a5 100644
--- a/cloud/openstack/os_floating_ip.py
+++ b/cloud/openstack/os_floating_ip.py
@@ -163,6 +163,10 @@ def main():
                 msg="server {0} not found".format(server_name_or_id))
 
         if state == 'present':
+            fip_address = cloud.get_server_public_ip(server)
+            f_ip = _get_floating_ip(cloud, fip_address)
+            if f_ip:
+                module.exit_json(changed=False, floating_ip=f_ip)
             server = cloud.add_ips_to_server(
                 server=server, ips=floating_ip_address, ip_pool=network,
                 reuse=reuse, fixed_address=fixed_address, wait=wait,