commit 3c9fcf1f96df62986f2ff9028246e56593a2e5f5
author Anastasia Kuznetsova <akuznetsova@mirantis.com> Wed Aug 22 15:10:05 2018 +0400
committer Ann Taraday <akamyshnikova@mirantis.com> Mon Sep 17 11:40:03 2018 +0400
tree 7f9ae160734da72d756cc2b99760af5472b939c0
parent 29b59b68aa5e2d6d005066dbc60b2e04df9b5c8f

Fix octavia installation in case of aio deployment

In case of aio deployment for testing purposes octavia api and
manager services are run  on the same node.
Run explicitly 'octavia.api' and 'octavia.manager' instead of calling
'octavia' on the expected appropriate node.

Related-PROD: PROD-22019

Change-Id: If37c00b8d763b4cc5a06cd0e725d72b7499bd564

src/com/mirantis/mk/Orchestrate.groovy

diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 051a462..d6ed52c 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -416,8 +416,8 @@
 
     // Install octavia api service
     if (salt.testTarget(master, "I@octavia:api ${extra_tgt}")) {
-        salt.enforceState(master, "I@octavia:api:role:primary ${extra_tgt}", 'octavia')
-        salt.enforceState(master, "I@octavia:api ${extra_tgt}", 'octavia')
+        salt.enforceState(master, "I@octavia:api:role:primary ${extra_tgt}", 'octavia.api')
+        salt.enforceState(master, "I@octavia:api ${extra_tgt}", 'octavia.api')
     }
 
     // Install DogTag server service
@@ -540,7 +540,7 @@
     // install octavia manager services
     if (salt.testTarget(master, "I@octavia:manager ${extra_tgt}")) {
         salt.runSaltProcessStep(master, "I@salt:master ${extra_tgt}", 'mine.update', ['*'])
-        salt.enforceState(master, "I@octavia:manager ${extra_tgt}", 'octavia')
+        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')
     }