Fixes for error when puppet apply fails

Add logs collecting to 2role and puppet apply fixes when fails.