Revert "Run salt.minion and full refresh consistently"
This reverts commit 1c9de586161c7229e9a9f3fdb6c79115d2f3d6c4.
Reason for revert: The duration of salt refresh grows 10-20 times even for middle-sized envs.
Change-Id: Ie7ff720bb0cb4dddfca5e927c6923c2d90bf1022
Closes-Bug: PROD-35205
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 2b1f8c9..e762eed 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -30,11 +30,11 @@
salt.enforceState([saltId: master, target: "I@salt:master ${extra_tgt}", state: ['linux.system']])
salt.enforceState([saltId: master, target: "I@salt:master ${extra_tgt}", state: ['salt.master'], failOnError: false, read_timeout: 120, retries: 2])
- salt.fullRefresh(master, "* ${extra_tgt}", null, true)
+ salt.fullRefresh(master, "* ${extra_tgt}", batch)
salt.enforceState([saltId: master, target: "I@salt:master ${extra_tgt}", state: ['salt.minion'], failOnError: false, read_timeout: 60, retries: 2])
salt.enforceState([saltId: master, target: "I@salt:master ${extra_tgt}", state: ['salt.minion']])
- salt.fullRefresh(master, "* ${extra_tgt}", null, true)
+ salt.fullRefresh(master, "* ${extra_tgt}", batch)
salt.enforceState([saltId: master, target: "* ${extra_tgt}", state: ['linux.network.proxy'], batch: batch, failOnError: false, read_timeout: 180, retries: 2])
// Make sure all repositories are in place before proceeding with package installation from other states
salt.enforceState([saltId: master, target: "* ${extra_tgt}", state: ['linux.system.repo'], batch: batch, failOnError: false, read_timeout: 180, retries: 2])
@@ -52,13 +52,12 @@
sleep(5)
salt.enforceState([saltId: master, target: "I@linux:system ${extra_tgt}", state: ['linux', 'openssh', 'ntp', 'rsyslog'], batch: batch])
- def saltMinionNodes = salt.getMinions(master, "* ${extra_tgt}")
- for (minion in saltMinionNodes) {
- salt.enforceState([saltId: master, target: minion, state: ['salt.minion'], failOnError: false, batch: null, read_timeout: 180, retries: 2])
- }
+
+ salt.enforceState([saltId: master, target: "* ${extra_tgt}", state: ['salt.minion'], failOnError: false, batch: batch, read_timeout: 180, retries: 2])
+
sleep(5)
- salt.fullRefresh(master, "* ${extra_tgt}", null, true)
+ salt.fullRefresh(master, "* ${extra_tgt}", batch)
salt.runSaltProcessStep(master, "* ${extra_tgt}", 'mine.update', [], batch, true)
salt.enforceState([saltId: master, target: "* ${extra_tgt}", state: ['linux.network.host'], batch: batch])
// WA for PROD-33911
@@ -1055,10 +1054,7 @@
// Install collectd, heka and sensu services on the nodes, this will also
// generate the metadata that goes into the grains and eventually into Salt Mine
salt.enforceState([saltId: master, target: "* ${extra_tgt}", state: 'collectd'])
- def saltMinionsNodes = salt.getMinions(master, "* ${extra_tgt}")
- for (minion in saltMinionsNodes) {
- salt.enforceState([saltId: master, target: minion, state: 'salt.minion', retries: 2])
- }
+ salt.enforceState([saltId: master, target: "* ${extra_tgt}", state: 'salt.minion', retries: 2])
salt.enforceState([saltId: master, target: "* ${extra_tgt}", state: 'heka'])
// Gather the Grafana metadata as grains