Get rid of hardcoded node names in pipelines
Change-Id: I2cbb062e7e1a8d7c6e41f8234581e66d063276c9
Related-Prod: PROD-25517
diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index 5cd74ea..9b1c89d 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -128,12 +128,9 @@
common.infoMsg('Work-around for PROD-29155 already apply, nothing todo')
return
}
- salt.fullRefresh(venvPepper, 'cfg*')
- salt.fullRefresh(venvPepper, 'cmp*')
+ salt.fullRefresh(venvPepper, 'I@salt:master')
+ salt.fullRefresh(venvPepper, 'I@nova:compute')
for (String minion in saltMinions) {
- if (!minion.startsWith('cmp')) {
- continue
- }
// First attempt, second will be performed in next validateReclassModel() stages
try {
salt.cmdRun(venvPepper, 'I@salt:master', "reclass -n ${minion}", true, null, false).get('return')[0].values()[0].replaceAll('Salt command execution success', '').trim()
@@ -431,7 +428,8 @@
}
wa29352(minions, cluster_name)
- wa29155(minions, cluster_name)
+ def computeMinions = salt.getMinions(venvPepper, 'I@nova:compute')
+ wa29155(computeMinions, cluster_name)
try {
common.infoMsg('Perform: UPDATE Reclass package')