commit 16ba214768fde91b0b06798f1cd253c240e5e4b3
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Nov 12 09:36:02 2018 +0000
committer Gerrit Code Review <mail@domain.com> Mon Nov 12 09:36:02 2018 +0000
tree beb56917345bb7368add66f559d0145938e55fbf
parent eeb312c66c995f24debafa21b178a9a8add58845
parent 8586da7ef1638b484143664a8b211117ec4093d4

Merge "Add Drivetrain node ssh credentials (lab)"

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}

kubernetes/common/init.yml

diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index b4cf429..1a35e84 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -52,8 +52,8 @@
     kubernetes_sidecar_image: ${_param:kubernetes_kubedns_repo}/k8s-dns-sidecar-amd64:1.14.5
     kubernetes_dns_autoscaler_image: ${_param:kubernetes_kubedns_repo}/cluster-proportional-autoscaler-amd64:1.0.0
     kubernetes_externaldns_image: ${_param:kubernetes_externaldns_repo}/external-dns:v0.5.6-2
-    kubernetes_genie_source: ${_param:kubernetes_genie_repo}/genie_v1.0-165-gbe0268b
-    kubernetes_genie_source_hash: md5=20da66e80eaa453461cf269bf793f2aa
+    kubernetes_genie_source: ${_param:kubernetes_genie_repo}/genie_v1.0-191-g9902422
+    kubernetes_genie_source_hash: md5=1f0b0434e9ba2bc3b6c7945b3dce4294
     kubernetes_flannel_image: ${_param:kubernetes_flannel_repo}/flannel:v0.10.0-amd64
     kubernetes_metallb_controller_image: ${_param:kubernetes_metallb_repo}/controller:v0.7.3-2
     kubernetes_metallb_speaker_image: ${_param:kubernetes_metallb_repo}/speaker:v0.7.3-2