commit 2da0d9c05fd34a1d2b64d4692929c084964814e3
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Oct 23 07:17:13 2018 +0000
committer Gerrit Code Review <mail@domain.com> Tue Oct 23 07:17:13 2018 +0000
tree f8a49a762d0363e8e29bb5bc9b44151eb735aaa8
parent 79d6f3b78bf2ac04e4507fcd90f583086acb3cc6
parent 822241050cc2f5ba66c97d8b7b12cd54f3ab1f44

Merge "Fix octavia manager installation"

src/com/mirantis/mk/Orchestrate.groovy

diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index ebb5782..f8912b7 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -468,10 +468,11 @@
 
     // install octavia manager services
     if (salt.testTarget(master, "I@octavia:manager ${extra_tgt}")) {
-        salt.runSaltProcessStep(master, "I@salt:master ${extra_tgt}", 'mine.update', ['*'])
+        salt.runSaltProcessStep(master, "I@neutron:client ${extra_tgt}", 'mine.update')
         salt.enforceState(master, "I@octavia:manager ${extra_tgt}", 'octavia.manager')
         salt.enforceState(master, "I@octavia:manager ${extra_tgt}", 'salt.minion.ca')
         salt.enforceState(master, "I@octavia:manager ${extra_tgt}", 'salt.minion.cert')
+        salt.enforceState(master, "I@octavia:client ${extra_tgt}", 'octavia.client')
     }
 }