commit a554ea073a0812f719915178f372d763ead251d2
author Svimba <psvimbersky@mirantis.com> Wed Jun 06 18:45:23 2018 +0200
committer Svimba <psvimbersky@mirantis.com> Wed Jun 06 18:45:23 2018 +0200
tree 012242cc23047a3f1f5c36839506e7350324b90e
parent 3199a2ef32a6a8b6b4ef3f7fd03fe10d246df934

Change pipeline K8s + OpenContrail 4.0

Change-Id: Ica3eaef29d148087f70e09b2ea66d7dfd7db0f8b

cloud-deploy-pipeline.groovy

diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index e4847ee..7f7337a 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -342,9 +342,8 @@
                 }
 
                 if (common.checkContains('STACK_INSTALL', 'contrail')) {
-                    stage('Install Contrail for Kubernetes') {
+                    stage('Install Contrail control') {
                         orchestrate.installContrailNetwork(venvPepper)
-                        orchestrate.installContrailCompute(venvPepper)
                     }
                 }
 
@@ -356,6 +355,12 @@
                     archiveArtifacts(artifacts: 'kubeconfig')
                 }
 
+                if (common.checkContains('STACK_INSTALL', 'contrail')) {
+                    stage('Install Contrail compute') {
+                        orchestrate.installContrailCompute(venvPepper)
+                    }
+                }
+
                 stage('Install Kubernetes computes') {
                     if (common.validInputParam('STACK_COMPUTE_COUNT')) {
                         if (STACK_COMPUTE_COUNT > 0) {