commit | 2421801e848a27e93efbdce0b46856a725ccd318 | [log] [tgz] |
---|---|---|
author | chnyda <chnyda@mirantis.com> | Tue Oct 10 12:04:55 2017 +0200 |
committer | chnyda <chnyda@mirantis.com> | Wed Oct 11 10:59:55 2017 +0200 |
tree | 9266d5d0fcfd6367a2bff82bc9f8fa00f7037c2d | |
parent | 268bc84268da464de723dc71d490a84c6963688c [diff] [blame] |
pepper: Reenable --make-token and cleanup previous virtualenv https://github.com/saltstack/pepper/pull/110/ enable .peppercache in custom location using the option -x Change-Id: Id445f81dc3ab0a762337ac58d629246f5c738cfa
diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy index 14d6c84..2809294 100644 --- a/src/com/mirantis/mk/Salt.groovy +++ b/src/com/mirantis/mk/Salt.groovy
@@ -662,7 +662,7 @@ def python = new com.mirantis.mk.Python() def dataStr = new groovy.json.JsonBuilder(data).toString() - def pepperCmd = "pepper -c ${venv}/pepperrc --json \'${dataStr}\'" + def pepperCmd = "pepper -c ${venv}/pepperrc --make-token -x ${venv} --json \'${dataStr}\'" if (venv) { output = python.runVirtualenvCommand(venv, pepperCmd)