Re-order second run openssh state
Run second run openssh state after salt.minion state and after full
refresh and linux.network.host to catch records for cmp nodes, which
are added dynamically.
Change-Id: I2056441db819892e67604145f7d780db249e6255
Related-Prod: PROD-33934
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index d599ccd..8f5d189 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -55,14 +55,13 @@
salt.enforceState([saltId: master, target: "* ${extra_tgt}", state: ['salt.minion'], failOnError: false, batch: batch, read_timeout: 180, retries: 2])
- // WA for PROD-33911
- salt.enforceState([saltId: master, target: "I@linux:system ${extra_tgt}", state: ['openssh'], batch: batch])
-
sleep(5)
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
+ salt.enforceState([saltId: master, target: "I@linux:system ${extra_tgt}", state: ['openssh'], batch: batch])
// Install and configure iptables
salt.enforceStateWithTest([saltId: master, target: "I@iptables:service ${extra_tgt}", state: 'iptables', batch: batch])