Refactor heat template

use more modern (in OpenStack terms) conventions