So, deployment-prep has its own salt master, so running salt commands from labs-wide saltmaster (virt1000) does not hit deployment-prep machines. This can be fixed with a salt-syndic setup that chains the deployment-prep saltmaster to virt1000.
This will also allow us to have more project-specific saltmasters - having one for tools would be helpful, I think.