commit f8a65aaee7575313585b445a1bc2128323a0fdb7
author Anton Samoylov <asamoylov@mirantis.com> Wed Jan 23 20:22:26 2019 +0400
committer Anton Samoylov <asamoylov@mirantis.com> Thu Jan 24 13:58:09 2019 +0400
tree 6ad354ac71681da60b9a8fa11be6d714959e1fbf
parent d6cba13d69ec036723af5dea5b8a9119e8d21658

Use separate method to check contrail-api service readiness

Related-PROD: PROD-26827
Depends-On: https://gerrit.mcp.mirantis.com/#/c/34428/

Change-Id: I7e95e9ca98a3f95c302b8162c19503029a49a3d0

cloud-deploy-pipeline.groovy

diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index eb9cc8e..9878a49 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -397,6 +397,9 @@
 
                 stage('Install Kubernetes control') {
                     orchestrate.installKubernetesControl(venvPepper, extra_tgt)
+                    if (common.checkContains('STACK_INSTALL', 'contrail')) {
+                        orchestrate.checkContrailApiReadiness(venvPepper, extra_tgt)
+                    }
 
                     // collect artifacts (kubeconfig)
                     writeFile(file: 'kubeconfig', text: salt.getFileContent(venvPepper, "I@kubernetes:master and *01* ${extra_tgt}", '/etc/kubernetes/admin-kube-config'))
@@ -473,6 +476,7 @@
 
                     if (common.checkContains('STACK_INSTALL', 'contrail')) {
                         orchestrate.installContrailNetwork(venvPepper, extra_tgt)
+                        orchestrate.checkContrailApiReadiness(venvPepper, extra_tgt)
                     } else if (common.checkContains('STACK_INSTALL', 'ovs')) {
                         orchestrate.installOpenstackNetwork(venvPepper, extra_tgt)
                     }