Merge "Change floating ip association method"