Merge pull request #662 from wallyworld/floating-ip-address-updates

Floating ip address updates

Fixes: https://bugs.launchpad.net/bugs/1364419

This is the second attempt to fix this issue. The first PR added code to use the floating IP address but it turns out that was only called at bootstrap, and then later the address poller overwrote the addresses. So extra code was needed in the instance gathering to also update the floating address details.
Merge pull request #672 from wallyworld/floating-ip-address-updates-trunk

Forward port pull request #662 from wallyworld/floating-ip-address-updates

Floating ip address updates

Fixes: https://bugs.launchpad.net/bugs/1364419

This is the second attempt to fix this issue. The first PR added code to use the floating IP address but it turns out that was only called at bootstrap, and then later the address poller overwrote the addresses. So extra code was needed in the instance gathering to also update the floating address details.