updates/fixes while testing with openstack-ha-cookbook