You use hiera now, yeah?

Change-Id: Ib999753868c6e011415fe8f1348460bbfa17d4b7