Fix up hiera variables

Change-Id: I7d7edef9876b57358fa6d215e97649d787bb42d7