commit eeb312c66c995f24debafa21b178a9a8add58845
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Nov 09 14:45:50 2018 +0000
committer Gerrit Code Review <mail@domain.com> Fri Nov 09 14:45:50 2018 +0000
tree 1d5d9fd03bf4e65c7e476aa0b21e1d6c680d0e5f
parent da52b4ae5f2403667f21b14ce53691a8dfd3b8d6
parent 5951245fa27b477e0e251fe80718f9bb3fba19d5

Merge "Fix opencotrail keystone endpoint resource v3"

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

kubernetes/master/common.yml

diff --git a/kubernetes/master/common.yml b/kubernetes/master/common.yml
index 1c92e00..f649b4d 100644
--- a/kubernetes/master/common.yml
+++ b/kubernetes/master/common.yml
@@ -15,9 +15,18 @@
         calico:
           enabled: ${_param:kubernetes_calico_enabled}
           image: ${_param:kubernetes_calico_image}
+          kube_controllers_image: ${_param:kubernetes_calico_kube_controllers_image}
+          calicoctl_source: ${_param:kubernetes_calico_calicoctl_source}
+          calicoctl_source_hash: ${_param:kubernetes_calico_calicoctl_source_hash}
+          birdcl_source: ${_param:kubernetes_calico_birdcl_source}
+          birdcl_source_hash: ${_param:kubernetes_calico_birdcl_source_hash}
+          cni_source: ${_param:kubernetes_calico_cni_source}
+          cni_source_hash: ${_param:kubernetes_calico_cni_source_hash}
+          cni_ipam_source: ${_param:kubernetes_calico_cni_ipam_source}
+          cni_ipam_source_hash: ${_param:kubernetes_calico_cni_ipam_source_hash}
+          # compatibility
           calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
           cni_image: ${_param:kubernetes_calico_cni_image}
-          kube_controllers_image: ${_param:kubernetes_calico_kube_controllers_image}
         opencontrail:
           enabled: ${_param:kubernetes_opencontrail_enabled}
           cni_image: ${_param:kubernetes_contrail_cni_image}