Remove cluster path stuff, add puppet task. WIP.