Merge "Increase verbosity of galera restore pipeline"
diff --git a/restore-cassandra.groovy b/restore-cassandra.groovy
index fb1259f..7285c40 100644
--- a/restore-cassandra.groovy
+++ b/restore-cassandra.groovy
@@ -32,8 +32,7 @@
try {
salt.enforceState(pepperEnv, 'I@opencontrail:control or I@opencontrail:collector', 'opencontrail.upgrade.verify', true, true)
} catch (Exception er) {
- common.errorMsg("Opencontrail controllers health check stage found issues with services. Please take a look at the logs above.")
- throw er
+ common.errorMsg("Opencontrail controllers health check stage found issues with currently running services.")
}
}
@@ -101,6 +100,14 @@
common.errorMsg('An error has been occurred during analytics containers startup: ' + err.getMessage())
throw err
}
+ // contrail-control service needs to be restart after db sync to re-initialize with recovered data
+ try {
+ common.infoMsg("Restart contrail-control services on control nodes")
+ salt.cmdRun(pepperEnv, 'I@opencontrail:control', 'doctrail controller service contrail-control restart')
+ } catch (Exception err) {
+ common.errorMsg('An error has been occurred during contrail-control services restart: ' + err.getMessage())
+ throw err
+ }
} else {
try {
salt.runSaltProcessStep(pepperEnv, 'I@opencontrail:control', 'service.stop', ['supervisor-config'], null, true)