commit f83409d6f48547f477b44494e277f6e039b6ae6f
author Tomáš Kukrál <tkukral@mirantis.com> Wed Nov 08 20:56:57 2017 +0100
committer Tomáš Kukrál <tkukral@mirantis.com> Thu Nov 09 10:40:00 2017 +0100
tree 4f595742340f85fe4f0b0adde6192da699df4cf0
parent 96c867a565f9e2fdd80487cb24044887ed6d06e2

fix STACK_COMPUTE_COUNT error

Change-Id: Ib167cca7c20620aac61d0a73e1c23a9541e50c01

cloud-deploy-pipeline.groovy

diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index 5ae3d28..cbb09b7 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -331,28 +331,31 @@
                 archiveArtifacts(artifacts: 'kubeconfig')
             }
 
-            stage('Scale Kubernetes computes') {
-                if (STACK_COMPUTE_COUNT > 0) {
-                    if (STACK_TYPE == 'aws') {
-                        // get stack info
-                        def scaling_group = aws.getOutputs(venv, aws_env_vars, STACK_NAME, 'ComputesScalingGroup')
+            stage('Install Kubernetes computes') {
+                if (common.validInputParam('STACK_COMPUTE_COUNT')) {
+                    if (STACK_COMPUTE_COUNT > 0) {
+                        if (STACK_TYPE == 'aws') {
+                            // get stack info
+                            def scaling_group = aws.getOutputs(venv, aws_env_vars, STACK_NAME, 'ComputesScalingGroup')
 
-                        //update autoscaling group
-                        aws.updateAutoscalingGroup(venv, aws_env_vars, scaling_group, ["--desired-capacity " + STACK_COMPUTE_COUNT])
+                            //update autoscaling group
+                            aws.updateAutoscalingGroup(venv, aws_env_vars, scaling_group, ["--desired-capacity " + STACK_COMPUTE_COUNT])
 
-                        // wait for computes to boot up
-                        aws.waitForAutoscalingInstances(venv, aws_env_vars, scaling_group)
-                        sleep(60)
+                            // wait for computes to boot up
+                            aws.waitForAutoscalingInstances(venv, aws_env_vars, scaling_group)
+                            sleep(60)
 
-                    } else if (STACK_TYPE == 'heat') {
-                        envParams.put('cluster_node_count', STACK_COMPUTE_COUNT)
+                        } else if (STACK_TYPE == 'heat') {
+                            envParams.put('cluster_node_count', STACK_COMPUTE_COUNT)
 
-                        openstack.createHeatStack(openstackCloud, STACK_NAME, STACK_TEMPLATE, envParams, HEAT_STACK_ENVIRONMENT, venv, "update")
-                        sleep(60)
+                            openstack.createHeatStack(openstackCloud, STACK_NAME, STACK_TEMPLATE, envParams, HEAT_STACK_ENVIRONMENT, venv, "update")
+                            sleep(60)
+                        }
+
                     }
-
-                    orchestrate.installKubernetesCompute(venvPepper)
                 }
+
+                orchestrate.installKubernetesCompute(venvPepper)
             }
         }