Update OpenContrail CNI
* Update URL for CNI
* Move hash from reclass cluster lever to default service level. Reclass
models should be cleaned up also.
Change-Id: Ic283ec027343a454d0134479996d6fd8cf86d9b2
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
diff --git a/kubernetes/pool/opencontrail.sls b/kubernetes/pool/opencontrail.sls
index e552839..e08eb61 100644
--- a/kubernetes/pool/opencontrail.sls
+++ b/kubernetes/pool/opencontrail.sls
@@ -15,7 +15,7 @@
/opt/cni/bin/opencontrail:
file.managed:
- - source: http://apt.tcpcloud.eu/kubernetes/bin/opencontrail
+ - source: http://apt-mk.mirantis.com/binaries/contrail_cni/opencontrail
- user: root
- group: root
- mode: 755
diff --git a/metadata/service/pool/cluster.yml b/metadata/service/pool/cluster.yml
index 7c42e12..1905d3a 100644
--- a/metadata/service/pool/cluster.yml
+++ b/metadata/service/pool/cluster.yml
@@ -33,6 +33,7 @@
kube_proxy: ${_param:kubernetes_kube-proxy_token}
ca: kubernetes
network:
+ hash: 77169cdadb80a5e33e9d9fe093ed0d99
etcd:
members:
- host: ${_param:cluster_node01_address}
diff --git a/metadata/service/pool/single.yml b/metadata/service/pool/single.yml
index b01a719..62e5911 100644
--- a/metadata/service/pool/single.yml
+++ b/metadata/service/pool/single.yml
@@ -30,6 +30,7 @@
kube_proxy: ${_param:kubernetes_kube-proxy_token}
ca: kubernetes
network:
+ hash: 77169cdadb80a5e33e9d9fe093ed0d99
etcd:
members:
- host: ${_param:master_address}