commit 5e50e174cfe6cdfdfdc3a5021b84b6638814ad01
author Jakub Josef <jakub.josef@gmail.com> Wed Dec 20 17:18:23 2017 +0100
committer Jakub Josef <jjosef@mirantis.com> Wed Dec 20 16:34:30 2017 +0000
tree fc7d91197f4566453a63b343e9d0857475adeadd
parent 0a7b070e4d959204998cd4f24e12649f88811b5f

Refactored internet checking in salt pepper communication

Change-Id: I7070d36dc7680d82e88dc778f0f3ec3b066bd1c7

src/com/mirantis/mk/Salt.groovy

diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index 54e9830..f320c7b 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -719,11 +719,14 @@
     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") && 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