Refactor Salt to allow simple usage of pepper
Change-Id: I48e9a85ca0c002311bc6c7331e8167aea888c930
diff --git a/src/com/mirantis/mk/Python.groovy b/src/com/mirantis/mk/Python.groovy
index 0b7716d..a288c93 100644
--- a/src/com/mirantis/mk/Python.groovy
+++ b/src/com/mirantis/mk/Python.groovy
@@ -291,8 +291,26 @@
* Install salt-pepper in isolated environment
*
* @param path Path where virtualenv is created
+ * @param url SALT_MASTER_URL
+ * @param credentialsId Credentials to salt api
*/
-def setupPepperVirtualenv(path) {
+def setupPepperVirtualenv(path, url, credentialsId) {
+ def common = new com.mirantis.mk.Common()
+
+ // virtualenv setup
requirements = ['salt-pepper']
setupVirtualenv(path, 'python2', requirements)
+
+ // pepperrc creation
+ rcFile = "${path}/pepperrc"
+ creds = common.getPasswordCredentials(credentialsId)
+ rc = """\
+[main]
+SALTAPI_EAUTH=pam
+SALTAPI_URL=${url}
+SALTAPI_USER=${creds.username}
+SALTAPI_PASS=${creds.password.toString()}
+"""
+ writeFile file: rcFile, text: rc
+ return rcFile
}