commit 3a17dd66fb87a8c08a3f565850dd5b993374ef99
author Tomáš Kukrál <tkukral@mirantis.com> Thu Jul 27 18:24:16 2017 +0200
committer Tomas Kukral <tkukral@mirantis.com> Mon Jul 31 11:39:35 2017 +0000
tree 8b295914b3b46b70cc37ec4da40b1bb125226103
parent 1cd5d7c7337191edf7b5dfccad7eed86a465b309

use OPENSTACK_API_VERSION directly

Change-Id: I94ddd2f634a186156fe32332660074f3c41eb3aa

cloud-deploy-pipeline.groovy

diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index 86036ca..e38e555 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -49,6 +49,7 @@
  *   SALT_OVERRIDES              YAML with overrides for Salt deployment
  *
  */
+
 common = new com.mirantis.mk.Common()
 git = new com.mirantis.mk.Git()
 openstack = new com.mirantis.mk.Openstack()
@@ -82,7 +83,6 @@
                 if (STACK_TYPE == 'heat') {
                     // value defaults
                     def openstackCloud
-                    def openstackVersion = OPENSTACK_API_CLIENT ? OPENSTACK_API_CLIENT : 'liberty'
 
                     if (STACK_REUSE.toBoolean() == true && STACK_NAME == '') {
                         error("If you want to reuse existing stack you need to provide it's name")
@@ -107,7 +107,7 @@
                     git.checkoutGitRepository('template', STACK_TEMPLATE_URL, STACK_TEMPLATE_BRANCH, STACK_TEMPLATE_CREDENTIALS)
 
                     // create openstack env
-                    openstack.setupOpenstackVirtualenv(venv, openstackVersion)
+                    openstack.setupOpenstackVirtualenv(venv, OPENSTACK_API_CLIENT)
                     openstackCloud = openstack.createOpenstackEnv(
                         OPENSTACK_API_URL, OPENSTACK_API_CREDENTIALS,
                         OPENSTACK_API_PROJECT, OPENSTACK_API_PROJECT_DOMAIN,