Fix prepare-ci-overcloud floating IP handling.

Change-Id: I0dabae5b2487f0dbe26a03d587e68743f04caf75
Merge "Fix prepare-ci-overcloud floating IP handling."