Re-align packer templates with upstream

common-packer co-opted a variable that was in use in local templates and
therefore is causing verification errors when the matrix validate
happens.

Change-Id: Ia0232836ddcda114409b2fc71705c5c4e97d90a0
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
4 files changed