Merge "Retry floating_ip_fixed_ip_associate on deadlock."

2013-02-27 00:40:26 +00:00
parent 7414e5137f 6e9a2f4261
commit 907594ec28
1 changed files with 1 additions and 0 deletions
@@ -744,6 +744,7 @@ def floating_ip_count_by_project(context, project_id, session=None):


@require_context
+@_retry_on_deadlock
 def floating_ip_fixed_ip_associate(context, floating_address,
                                   fixed_address, host):
    session = get_session()