commit 1dd6e4ca82d687800e6f396d4a1f0e87cb3b5a01
author Filip Pytloun <fpytloun@mirantis.com> Fri Jun 02 08:08:54 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Fri Jun 02 08:08:56 2017 +0000
tree 4e6f1b39921563431dc91eb0a1c7d214fb64dd52
parent edda463ad296fdd7e01a035999eb4ce5f1e6e06f
parent 480aa32c9211f700d41b0e5f36e37a5a8718505d

Merge "Correct naming of keystone v3 params in lab and cleanup job"

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 687e1f3..d5dca47 100644
--- a/jenkins/client/job/deploy/lab/mk/cleanup.yml
+++ b/jenkins/client/job/deploy/lab/mk/cleanup.yml
@@ -42,10 +42,16 @@
             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:
+            OPENSTACK_API_PROJECT_ID:
+              type: string
+              default: ""
+            OPENSTACK_API_USER_DOMAIN:
+              type: string
+              default: "default"
+            OPENSTACK_API_USER_DOMAIN:
               type: string
               default: "default"
 

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

diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index c9833ef..75c63a9 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -103,7 +103,7 @@
               OPENSTACK_USER_DOMAIN:
                 type: string
                 default: "default"
-              OPENSTACK_API_USER_DOMAIN_ID:
+              OPENSTACK_API_USER_DOMAIN:
                 type: string
                 default: "default"