Merge "Correct keystonev3 params for lab and cleanup job"
diff --git a/cleanup-pipeline.groovy b/cleanup-pipeline.groovy
index 4b67213..a2949eb 100644
--- a/cleanup-pipeline.groovy
+++ b/cleanup-pipeline.groovy
@@ -7,11 +7,14 @@
* STACK_TYPE Type of the stack (heat, aws)
*
* Heat parameters:
- * OPENSTACK_API_URL OpenStack API address
- * OPENSTACK_API_CREDENTIALS Credentials to the OpenStack API
- * OPENSTACK_API_PROJECT OpenStack project to connect to
- * OPENSTACK_API_CLIENT Versions of OpenStack python clients
- * OPENSTACK_API_VERSION Version of the OpenStack API (2/3)
+ * OPENSTACK_API_URL OpenStack API address
+ * OPENSTACK_API_CREDENTIALS Credentials to the OpenStack API
+ * OPENSTACK_API_PROJECT OpenStack project to connect to
+ * OPENSTACK_API_PROJECT_DOMAIN Domain for OpenStack project
+ * OPENSTACK_API_PROJECT_ID ID for OpenStack project
+ * OPENSTACK_API_USER_DOMAIN Domain for OpenStack user
+ * OPENSTACK_API_CLIENT Versions of OpenStack python clients
+ * OPENSTACK_API_VERSION Version of the OpenStack API (2/3)
*
* AWS parameters:
* AWS_API_CREDENTIALS Credentials id AWS EC2 API
@@ -53,7 +56,11 @@
stage('Delete stack') {
if (STACK_TYPE == 'heat') {
- def openstackCloud = openstack.createOpenstackEnv(OPENSTACK_API_URL, OPENSTACK_API_CREDENTIALS, OPENSTACK_API_PROJECT)
+ def openstackCloud = openstack.createOpenstackEnv(
+ OPENSTACK_API_URL, OPENSTACK_API_CREDENTIALS,
+ OPENSTACK_API_PROJECT,OPENSTACK_API_PROJECT_DOMAIN,
+ OPENSTACK_API_PROJECT_ID, OPENSTACK_API_USER_DOMAIN,
+ OPENSTACK_API_VERSION)
openstack.getKeystoneToken(openstackCloud, venv_path)
common.infoMsg("Deleting Heat Stack " + STACK_NAME)
diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index ab1389d..3522eac 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -17,17 +17,17 @@
*
* Expected parameters:
* required for STACK_TYPE=heat
- * HEAT_STACK_ENVIRONMENT Heat stack environmental parameters
- * HEAT_STACK_ZONE Heat stack availability zone
- * HEAT_STACK_PUBLIC_NET Heat stack floating IP pool
- * OPENSTACK_API_URL OpenStack API address
- * OPENSTACK_API_CREDENTIALS Credentials to the OpenStack API
- * OPENSTACK_API_PROJECT OpenStack project to connect to
- * OPENSTACK_PROJECT_DOMAIN Domain for OpenStack project
- * OPENSTACK_PROJECT_ID ID for OpenStack project
- * OPENSTACK_USER_DOMAIN Domain for OpenStack user
- * OPENSTACK_API_CLIENT Versions of OpenStack python clients
- * OPENSTACK_API_VERSION Version of the OpenStack API (2/3)
+ * HEAT_STACK_ENVIRONMENT Heat stack environmental parameters
+ * HEAT_STACK_ZONE Heat stack availability zone
+ * HEAT_STACK_PUBLIC_NET Heat stack floating IP pool
+ * OPENSTACK_API_URL OpenStack API address
+ * OPENSTACK_API_CREDENTIALS Credentials to the OpenStack API
+ * OPENSTACK_API_PROJECT OpenStack project to connect to
+ * OPENSTACK_API_PROJECT_DOMAIN Domain for OpenStack project
+ * OPENSTACK_API_PROJECT_ID ID for OpenStack project
+ * OPENSTACK_API_USER_DOMAIN Domain for OpenStack user
+ * OPENSTACK_API_CLIENT Versions of OpenStack python clients
+ * OPENSTACK_API_VERSION Version of the OpenStack API (2/3)
*
* SALT_MASTER_CREDENTIALS Credentials to the Salt API
*
@@ -109,8 +109,8 @@
openstack.setupOpenstackVirtualenv(openstackEnv, openstackVersion)
openstackCloud = openstack.createOpenstackEnv(
OPENSTACK_API_URL, OPENSTACK_API_CREDENTIALS,
- OPENSTACK_API_PROJECT,OPENSTACK_PROJECT_DOMAIN,
- OPENSTACK_PROJECT_ID, OPENSTACK_USER_DOMAIN,
+ OPENSTACK_API_PROJECT, OPENSTACK_API_PROJECT_DOMAIN,
+ OPENSTACK_API_PROJECT_ID, OPENSTACK_API_USER_DOMAIN,
OPENSTACK_API_VERSION)
openstack.getKeystoneToken(openstackCloud, openstackEnv)
//