Removed offline state checking
Change-Id: I162fd093523965cd6a7c42d307e9e8034c0064ab
diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index eeda9c4..c7b2d37 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -723,25 +723,9 @@
def python = new com.mirantis.mk.Python()
def dataStr = new groovy.json.JsonBuilder(data).toString()
- //def offlineDeployment = env.getEnvironment().containsKey("OFFLINE_DEPLOYMENT") && env["OFFLINE_DEPLOYMENT"].toBoolean()
- def offlineDeployment = env.getEnvironment().containsKey("OFFLINE_DEPLOYMENT")
- if(!offlineDeployment){
- //TODO: remove wget after global env prop enforcments
- def netcheckResult = sh(script: "wget -q -T 10 --spider http://google.com", returnStatus: true)
- offlineDeployment = netcheckResult != 0 && netcheckResult <= 5
- }else{
- offlineDeployment = env["OFFLINE_DEPLOYMENT"].toBoolean()
- }
- def pepperCmd
-
- if (!offlineDeployment) {
- def pepperCmdFile = "${venv}/pepper-cmd.json"
- writeFile file: pepperCmdFile, text: dataStr
- pepperCmd = "pepper -c ${venv}/pepperrc --make-token -x ${venv}/.peppercache --json-file ${pepperCmdFile}"
- } else {
- common.warningMsg("You might be offline, will use pepper with option --json instead of option --json-file, some complex commands like complicated cmd.runs may not work!")
- pepperCmd = "pepper -c ${venv}/pepperrc --make-token -x ${venv}/.peppercache --json \"" + dataStr.replaceAll('"', '\\\\\\\"') + "\"" // yeah, really 7 backslashes, don't ask why
- }
+ def pepperCmdFile = "${venv}/pepper-cmd.json"
+ writeFile file: pepperCmdFile, text: dataStr
+ def pepperCmd = "pepper -c ${venv}/pepperrc --make-token -x ${venv}/.peppercache --json-file ${pepperCmdFile}"
if (venv) {
output = python.runVirtualenvCommand(venv, pepperCmd, true)