Modified some puppet scripts