Stripped all cli stuff from ext. pillar and put it in pepa-cli.py