Factor wait_for_ha_master and wait_for_server_ready out into separate HWRPs that can be used independently
Move the waits to where they belong - after the reconfigure and/or upgrade
Point the pivotal knife config at api_fqdn instead of manage_fqdn, so you're effectively hitting localhost
Unrelated, but add a missing standalone test file for Ubuntu 12.04