Convert variables to  use hiera

Change-Id: Ia3035ed8c881b452313c14a3ca13d8d66b4149d8