Convert to hiera variables

Change-Id: I65dcab3e5619468b3a7000e19e9c8e1070fff14c