Merge "Update openstack-compute-install pipeline"
diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index bfed52d..e8776bb 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -356,7 +356,11 @@
// Install
//
if (!batch_size) {
- batch_size = salt.getWorkerThreads(venvPepper)
+ // if no batch size provided get current worker threads and set batch size to 2/3 of it to avoid
+ // 'SaltReqTimeoutError: Message timed out' issue on Salt targets for large amount of nodes
+ // do not use toDouble/Double as it requires additional approved method
+ def workerThreads = salt.getWorkerThreads(venvPepper).toInteger()
+ batch_size = (workerThreads * 2 / 3).toString().tokenize('.')[0]
}
// Check if all minions are reachable and ready
diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index 7695159..e5da725 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -410,7 +410,11 @@
error('Pillar data is broken for Salt master node! Please check it manually and re-run pipeline.')
}
if (!batchSize) {
- batchSize = getWorkerThreads(venvPepper)
+ // if no batch size provided get current worker threads and set batch size to 2/3 of it to avoid
+ // 'SaltReqTimeoutError: Message timed out' issue on Salt targets for large amount of nodes
+ // do not use toDouble/Double as it requires additional approved method
+ def workerThreads = getWorkerThreads(venvPepper).toInteger()
+ batch_size = (workerThreads * 2 / 3).toString().tokenize('.')[0]
}
def computeMinions = salt.getMinions(venvPepper, 'I@nova:compute')