commit 391df0d680c436fa48dae7d73b3d18e70cf388df
author Tomáš Kukrál <tkukral@mirantis.com> Tue Jun 13 10:37:02 2017 +0200
committer Tomas Kukral <tkukral@mirantis.com> Tue Jun 13 08:38:48 2017 +0000
tree 4216ab12913b5f5a7e3e461335637d66084d69a0
parent 3b1d2a6def25032727f6f0b02ce3c98676a28ad1

install contrail first

Change-Id: I2aabafa84815c2957064bbaacb7eea8a7bfa34d7

lab-pipeline.groovy

diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index 2a95a49..255335d 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -174,6 +174,16 @@
 
             // install k8s
             if (common.checkContains('STACK_INSTALL', 'k8s')) {
+
+                stage('Install Contrail for Kubernetes') {
+                    if (common.checkContains('STACK_INSTALL', 'contrail')) {
+                        stage('Install Contrail for Kubernetes') {
+                            orchestrate.installContrailNetwork(saltMaster)
+                            orchestrate.installContrailCompute(saltMaster)
+                        }
+                    }
+                }
+
                 stage('Install Kubernetes infra') {
                     orchestrate.installKubernetesInfra(saltMaster)
                 }
@@ -210,12 +220,6 @@
                 }
 
 
-                if (common.checkContains('STACK_INSTALL', 'contrail')) {
-                    state('Install Contrail for Kubernetes') {
-                        orchestrate.installContrailNetwork(saltMaster)
-                        orchestrate.installContrailCompute(saltMaster)
-                    }
-                }
             }
 
             // install openstack