commit 2db605f738f71c2f439648c8acfbc81f61a450ee
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Nov 12 09:37:21 2018 +0000
committer Gerrit Code Review <mail@domain.com> Mon Nov 12 09:37:21 2018 +0000
tree 23fb354a46292eaebe1aad5fd883b4d9484b2867
parent 16ba214768fde91b0b06798f1cd253c240e5e4b3
parent d8d8a5a7569925b5b6075e9bffb0a2581d9baf09

Merge "Single and multislave configurations"

jenkins/client/credential/lab.yml

diff --git a/jenkins/client/credential/lab.yml b/jenkins/client/credential/lab.yml
new file mode 100644
index 0000000..68375e3
--- /dev/null
+++ b/jenkins/client/credential/lab.yml
@@ -0,0 +1,9 @@
+parameters:
+  _param:
+    lab_ssh_user: root
+  jenkins:
+    client:
+      credential:
+        lab:
+          username: ${_param:lab_ssh_user}
+          key: ${_param:cluster_private_key}

keystone/client/v3/service/contrail.yml

diff --git a/keystone/client/v3/service/contrail.yml b/keystone/client/v3/service/contrail.yml
index a43f222..9eee3e8 100644
--- a/keystone/client/v3/service/contrail.yml
+++ b/keystone/client/v3/service/contrail.yml
@@ -6,19 +6,20 @@
     client:
       resources:
         v3:
-          opencontrail:
-            type: contrail
-            description: OpenContrail API
-            endpoints:
-              contrail_public:
-                interface: 'public'
-                url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:8082
-                region: ${_param:openstack_region}
-              contrail_internal:
-                interface: 'internal'
-                url: ${_param:contrail_service_protocol}://${_param:opencontrail_control_address}:8082
-                region: ${_param:openstack_region}
-              contrail_admin:
-                interface: 'admin'
-                url: ${_param:contrail_service_protocol}://${_param:opencontrail_control_address}:8082
-                region: ${_param:openstack_region}
+          services:
+            opencontrail:
+              type: contrail
+              description: OpenContrail API
+              endpoints:
+                contrail_public:
+                  interface: 'public'
+                  url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:8082
+                  region: ${_param:openstack_region}
+                contrail_internal:
+                  interface: 'internal'
+                  url: ${_param:contrail_service_protocol}://${_param:opencontrail_control_address}:8082
+                  region: ${_param:openstack_region}
+                contrail_admin:
+                  interface: 'admin'
+                  url: ${_param:contrail_service_protocol}://${_param:opencontrail_control_address}:8082
+                  region: ${_param:openstack_region}