Make bootstrapping idempotent
Adapt to testing puppet