install contrail first
Change-Id: I2aabafa84815c2957064bbaacb7eea8a7bfa34d7
diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index aebca46..2f07d56 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -234,7 +234,7 @@
}
if (common.checkContains('STACK_INSTALL', 'contrail')) {
- state('Install Contrail for Kubernetes') {
+ stage('Install Contrail for Kubernetes') {
orchestrate.installContrailNetwork(saltMaster)
orchestrate.installContrailCompute(saltMaster)
}
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