Fix circular dependency for hiera based db creation