exclude opencontrail.client from compute highstate and move it after reboot
Change-Id: Ie63bcb585e2f7e1cb01e8be7b764b24702d4dc42
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 8954017..202949b 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -171,7 +171,7 @@
// Configure compute nodes
retry(2) {
- salt.runSaltProcessStep(master, 'I@nova:compute', 'state.apply', [], null, true)
+ salt.runSaltProcessStep(master, 'I@nova:compute', 'state.highstate', ['exclude=opencontrail.client'], null, true)
}
}
@@ -211,10 +211,10 @@
// Provision opencontrail control services
salt.enforceState(master, 'I@opencontrail:database:id:1', 'opencontrail.client', true)
// Provision opencontrail virtual routers
- salt.enforceState(master, 'I@opencontrail:compute', 'opencontrail.client', true)
salt.runSaltProcessStep(master, 'I@nova:compute', 'cmd.run', ['exec 0>&-; exec 1>&-; exec 2>&-; nohup bash -c "ip link | grep vhost && echo no_reboot || sleep 5 && reboot & "'], null, true)
sleep(300)
+ salt.enforceState(master, 'I@opencontrail:compute', 'opencontrail.client', true)
}