commit c72219b34550ffb26325b4131c84c6486fc8f59a
author Matthew Mosesohn <mmosesohn@mirantis.com> Fri Jun 02 16:48:58 2017 +0300
committer Matthew Mosesohn <mmosesohn@mirantis.com> Fri Jun 02 16:48:58 2017 +0300
tree 5a0b1b621b92de7b9b2d59d988fcdaf796307adf
parent 132578ee536479f5919c94fb37ca980db296578e

Correct all keystone params for all jobs that use OpenStack auth

Change-Id: Ib146807e9f809f3cacc174aa3b144092d415b47d

jenkins/client/job/deploy/lab/cicd.yml

diff --git a/jenkins/client/job/deploy/lab/cicd.yml b/jenkins/client/job/deploy/lab/cicd.yml
index d2bd1f7..fb1dd92 100644
--- a/jenkins/client/job/deploy/lab/cicd.yml
+++ b/jenkins/client/job/deploy/lab/cicd.yml
@@ -75,9 +75,15 @@
               OPENSTACK_API_VERSION:
                 type: string
                 default: "2"
-              OPENSTACK_API_PROJECT_DOMAIN_ID:
+              OPENSTACK_API_PROJECT_DOMAIN:
                 type: string
                 default: "default"
               OPENSTACK_API_USER_DOMAIN_ID:
                 type: string
                 default: "default"
+              OPENSTACK_API_PROJECT_ID:
+                type: string
+                default: ""
+              OPENSTACK_API_USER_DOMAIN:
+                type: string
+                default: "default"

jenkins/client/job/deploy/lab/mk/cleanup.yml

diff --git a/jenkins/client/job/deploy/lab/mk/cleanup.yml b/jenkins/client/job/deploy/lab/mk/cleanup.yml
index d5dca47..a400842 100644
--- a/jenkins/client/job/deploy/lab/mk/cleanup.yml
+++ b/jenkins/client/job/deploy/lab/mk/cleanup.yml
@@ -51,9 +51,6 @@
             OPENSTACK_API_USER_DOMAIN:
               type: string
               default: "default"
-            OPENSTACK_API_USER_DOMAIN:
-              type: string
-              default: "default"
 
             # aws parameters
             AWS_API_CREDENTIALS:
@@ -95,9 +92,15 @@
             OPENSTACK_API_VERSION:
               type: string
               default: "2"
-            OPENSTACK_API_PROJECT_DOMAIN_ID:
+            OPENSTACK_API_PROJECT_DOMAIN:
               type: string
               default: "default"
             OPENSTACK_API_USER_DOMAIN_ID:
               type: string
               default: "default"
+            OPENSTACK_API_PROJECT_ID:
+              type: string
+              default: ""
+            OPENSTACK_API_USER_DOMAIN:
+              type: string
+              default: "default"

jenkins/client/job/deploy/lab/mk/cloud.yml

diff --git a/jenkins/client/job/deploy/lab/mk/cloud.yml b/jenkins/client/job/deploy/lab/mk/cloud.yml
index 32542ca..e6fb6d5 100644
--- a/jenkins/client/job/deploy/lab/mk/cloud.yml
+++ b/jenkins/client/job/deploy/lab/mk/cloud.yml
@@ -109,12 +109,18 @@
               OPENSTACK_API_VERSION:
                 type: string
                 default: "2"
-              OPENSTACK_API_PROJECT_DOMAIN_ID:
+              OPENSTACK_API_PROJECT_DOMAIN:
                 type: string
                 default: "default"
               OPENSTACK_API_USER_DOMAIN_ID:
                 type: string
                 default: "default"
+              OPENSTACK_API_PROJECT_ID:
+                type: string
+                default: ""
+              OPENSTACK_API_USER_DOMAIN:
+                type: string
+                default: "default"
 
               # heat
               HEAT_STACK_ENVIRONMENT: