Put vagrant VM names as an option rather than the key, so that the hostname becomes the key to simplify openstack deployment
Merge branch 'pr'

Conflicts:
	data/nodes/2_role.yaml