Fix openstack bootstrap

Fixes for bootstrapping OpenStack servers.