Ability to address commands to different clouds
The patch adds ability to address commands using extra targeting composed
from pillar and extra_target option to different clouds even though they
have the same pillar structure.
Change-Id: I6f6d67e30399c581d85f29fe8a1345a3b4e10063
Related-PROD: PROD-20579
Related-PROD: PROD-20581
diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index 188af61..6ddac8a 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -905,7 +905,7 @@
* @param reclass_dir Directory where Reclass git repo is located
*/
-def setSaltOverrides(saltId, salt_overrides, reclass_dir="/srv/salt/reclass") {
+def setSaltOverrides(saltId, salt_overrides, reclass_dir="/srv/salt/reclass", extra_tgt = '') {
def common = new com.mirantis.mk.Common()
def salt_overrides_map = readYaml text: salt_overrides
for (entry in common.entries(salt_overrides_map)) {
@@ -913,9 +913,9 @@
def value = entry[1]
common.debugMsg("Set salt override ${key}=${value}")
- runSaltProcessStep(saltId, 'I@salt:master', 'reclass.cluster_meta_set', [key, value], false)
+ runSaltProcessStep(saltId, "I@salt:master ${extra_tgt}", 'reclass.cluster_meta_set', [key, value], false)
}
- runSaltProcessStep(saltId, 'I@salt:master', 'cmd.run', ["git -C ${reclass_dir} update-index --skip-worktree classes/cluster/overrides.yml"])
+ runSaltProcessStep(saltId, "I@salt:master ${extra_tgt}", 'cmd.run', ["git -C ${reclass_dir} update-index --skip-worktree classes/cluster/overrides.yml"])
}
/**