commit 2421801e848a27e93efbdce0b46856a725ccd318
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

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

src/com/mirantis/mk/Python.groovy

diff --git a/src/com/mirantis/mk/Python.groovy b/src/com/mirantis/mk/Python.groovy
index 6180daf..3a2558e 100644
--- a/src/com/mirantis/mk/Python.groovy
+++ b/src/com/mirantis/mk/Python.groovy
@@ -295,8 +295,8 @@
     def common = new com.mirantis.mk.Common()
 
     // virtualenv setup
-    requirements = ['salt-pepper']
-    setupVirtualenv(path, 'python2', requirements)
+    setupVirtualenv(path, 'python2')
+    runVirtualenvCommand(path, "pip install git+git://github.com/saltstack/pepper.git")
 
     // pepperrc creation
     rcFile = "${path}/pepperrc"

src/com/mirantis/mk/Salt.groovy

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)