more changes to cf-infrastructure-openstack.yml
final, working cf-infrastructure-openstack.yml