Fixed resource cleaning in salt prints
Change-Id: I2d47383a82a8d9e884adce1abb5d19c4e85cf631
diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index e7e6a10..cc98228 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -345,10 +345,18 @@
resKey = k
}
resource = node[resKey]
- //clean unnesaccary fields
- resource.remove("__run_num__")
- resource.remove("__id__")
if(resource instanceof Map && resource.keySet().contains("result")){
+ //clean unnesaccary fields
+ if(resource.keySet().contains("__run_num__")){
+ resource.remove("__run_num__")
+ }
+ if(resource.keySet().contains("__id__")){
+ resource.remove("__id__")
+ }
+ if(resource.keySet().contains("pchanges")){
+ resource.remove("pchanges")
+ }
+
if(!resource["result"] || (resource["result"] instanceof String && resource["result"] != "true")){
common.errorMsg(String.format("Resource: %s\n%s", resKey, prettyPrint(toJson(resource)).replace('\\n', System.getProperty('line.separator'))))
}else{