commit cd5b277b5c347c1f153e7a1d3fb345a90313e3c5
author Sergio Lystopad <slystopad@mirantis.com> Fri Feb 09 14:37:10 2018 +0200
committer Jakub Josef <jjosef@mirantis.com> Tue Feb 13 11:19:02 2018 +0000
tree 5a88b3689cae5a743a15227c401d90b862f153dd
parent 4f62a098d7a2c35c007e2f4c49fba460cae2833b

Check that nova compute minion exists before running states

Change-Id: Ic2b3f9b9ac757334b4b0aeeaacadf9799c93a137

src/com/mirantis/mk/Orchestrate.groovy

diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 67b4298..5ec8a78 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -346,8 +346,10 @@
 def installOpenstackCompute(master) {
     def salt = new com.mirantis.mk.Salt()
     // Configure compute nodes
-    retry(2) {
-        salt.enforceHighstateWithExclude(master, 'I@nova:compute', 'opencontrail.client')
+    if (salt.testTarget(master, 'I@nova:compute')) {
+        retry(2) {
+            salt.enforceHighstateWithExclude(master, 'I@nova:compute', 'opencontrail.client')
+        }
     }
 }
 
@@ -381,9 +383,13 @@
     // Provision opencontrail virtual routers
 
     // Generate script /usr/lib/contrail/if-vhost0 for up vhost0
-    salt.enforceStateWithExclude(master, "I@opencontrail:compute", "opencontrail", "opencontrail.client")
+    if (salt.testTarget(master, 'I@opencontrail:compute')) {
+        salt.enforceStateWithExclude(master, "I@opencontrail:compute", "opencontrail", "opencontrail.client")
+    }
 
-    salt.cmdRun(master, 'I@nova:compute', 'exec 0>&-; exec 1>&-; exec 2>&-; nohup bash -c "ip link | grep vhost && echo no_reboot || sleep 5 && reboot & "', false)
+    if (salt.testTarget(master, 'I@nova:compute')) {
+        salt.cmdRun(master, 'I@nova:compute', 'exec 0>&-; exec 1>&-; exec 2>&-; nohup bash -c "ip link | grep vhost && echo no_reboot || sleep 5 && reboot & "', false)
+    }
 
     if (salt.testTarget(master, 'I@opencontrail:compute')) {
         sleep(300)