commit 03d4d5a164d0bf07b69b1afafd30817da8dca134
author Jakub Josef <jakub.josef@gmail.com> Wed Dec 20 16:35:09 2017 +0100
committer Jakub Josef <jjosef@mirantis.com> Wed Dec 20 16:07:14 2017 +0000
tree 7918ec0f720f01fff09696a6f566ef0eb9a11ead
parent 1cb967bf5c2621bbd4a31822c5e6eca0a74776ec

Added proper logging to pepper calls in offline deployment

Change-Id: If8ac6e97456c5d44cd8fbb073ec848aa6e959dc7

src/com/mirantis/mk/Salt.groovy

diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index 018d9d4..54e9830 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -715,19 +715,15 @@
 */
 
 def runPepperCommand(data, venv)   {
+    def common = new com.mirantis.mk.Common()
     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()
     if(!offlineDeployment){
-      try {
-        //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
-      } catch(Exception e) {
-        def common = new com.mirantis.mk.Common()
-        common.warningMsg("You might be offline, will use pepper with option --json instead of option --json-file")
-      }
+      //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
     }
     def pepperCmd
 
@@ -736,6 +732,7 @@
         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
     }