WIP more openstack template work