commit b19bddaa531f4badee2f87a883b4c0a34fef2723
author Tomáš Kukrál <tkukral@mirantis.com> Tue Jun 13 17:09:43 2017 +0200
committer Tomas Kukral <tkukral@mirantis.com> Tue Jun 13 15:17:19 2017 +0000
tree 7673cb2036dd8426b4636698d2e54b30c2dab18f
parent 125737768b8283308453d55f1805d96fb1716d4f

use ControlLoadBalancer

Change-Id: I8a391085446b2911741a98ba3b5e05956302b07b

cloud-deploy-pipeline.groovy

diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index eacfd7d..0b181f9 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -54,6 +54,11 @@
 
 def saltMaster
 
+if (STACK_TYPE == 'aws') {
+    def venv_path = 'aws_venv'
+    def env_vars = aws.getEnvVars(AWS_API_CREDENTIALS, AWS_STACK_REGION)
+}
+
 timestamps {
     node {
         try {
@@ -147,10 +152,6 @@
                     // set description
                     currentBuild.description = STACK_NAME
 
-                    // prepare configuration
-                    def venv_path = 'aws_venv'
-                    def env_vars = aws.getEnvVars(AWS_API_CREDENTIALS, AWS_STACK_REGION)
-
                     if (STACK_REUSE.toBoolean() == false) {
                         // get templates
                         git.checkoutGitRepository('template', STACK_TEMPLATE_URL, STACK_TEMPLATE_BRANCH, STACK_TEMPLATE_CREDENTIALS)
@@ -203,6 +204,11 @@
             // install k8s
             if (common.checkContains('STACK_INSTALL', 'k8s')) {
                 stage('Install Kubernetes infra') {
+                    // configure kubernetes_control_address - save loadbalancer
+                    def kubernetes_control_address = aws.getOutputs(venv_path, env_vars, STACK_NAME, 'ControlLoadBalancer')
+                    print(kubernetes_control_address)
+                    salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', 'kubernetes_control_address', kubernetes_control_address)
+
                     orchestrate.installKubernetesInfra(saltMaster)
                 }
 
@@ -215,9 +221,6 @@
                 stage('Scale Kubernetes computes') {
                     if (STACK_COMPUTE_COUNT > 0) {
                         if (STACK_TYPE == 'aws') {
-                            // configure aws
-                            def venv_path = 'aws_venv'
-                            def env_vars = aws.getEnvVars(AWS_API_CREDENTIALS, AWS_STACK_REGION)
 
                             // get stack info
                             def scaling_group = aws.getOutputs(venv_path, env_vars, STACK_NAME, 'ComputesScalingGroup')