fix getPillar output
Change-Id: I9f88c0f2029aa65a8a1a6877192387440fcee699
diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index f406bc9..c2171b3 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -83,12 +83,14 @@
}
def getPillar(master, target, pillar = null) {
- if(pillar != null) {
- def out = runSaltCommand(master, 'local', ['expression': target, 'type': 'compound'], 'pillar.get', null, [pillar.replace('.', ':')])
+ def out
+
+ if (pillar != null) {
+ out = runSaltCommand(master, 'local', ['expression': target, 'type': 'compound'], 'pillar.get', null, [pillar.replace('.', ':')])
+ } else {
+ out = runSaltCommand(master, 'local', ['expression': target, 'type': 'compound'], 'pillar.data')
}
- else {
- def out = runSaltCommand(master, 'local', ['expression': target, 'type': 'compound'], 'pillar.data')
- }
+
return out
}