Update to work with new heat templates

Change-Id: I23d915d10d75c371793d94b65e1fbb29d1ee3d61
4 files changed