Run puppet more like userdata

...and make maybe-upgrade.sh work, too.