commit 91c16400582ed257b594e4507ac408499c7b3724
author Tomas Kukral <tkukral@mirantis.com> Mon Jun 19 14:24:25 2017 +0000
committer Tomas Kukral <tkukral@mirantis.com> Tue Jun 20 07:23:00 2017 +0000
tree 9679d2f196749f2fa1f23c5808f5dfe17c2b94a2
parent f20c767890f329c839f051af89e01787da42a53d

Revert "install contrail first"

This reverts commit 391df0d680c436fa48dae7d73b3d18e70cf388df.

Change-Id: I7c2ba841e8f02138057da1bfb284722d92c217b6

lab-pipeline.groovy

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