fix order of cni loading
Change-Id: I68ae41befa6b15818c60664f16759e52b2a1f05d
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3b4282e..ab6845b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,7 +1,11 @@
kubernetes formula
==================
-2016.1.1 (2017-01-18)
+2017.1.2 (2017-01-19)
+
+- fix cni copy order
+
+2017.1.1 (2017-01-18)
- move basic k8s setup to common
- copy cni from hyperkube
diff --git a/VERSION b/VERSION
index 8dd13ce..170fa1a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2017.1.1
+2017.1.2
diff --git a/kubernetes/pool/init.sls b/kubernetes/pool/init.sls
index e43e53d..713f849 100644
--- a/kubernetes/pool/init.sls
+++ b/kubernetes/pool/init.sls
@@ -1,10 +1,10 @@
{%- from "kubernetes/map.jinja" import pool with context %}
include:
- kubernetes.pool.cni
-- kubernetes.pool.service
{%- if pool.network.engine == "calico" %}
- kubernetes.pool.calico
{%- endif %}
+- kubernetes.pool.service
- kubernetes.pool.kubelet
{%- if pool.network.engine == "flannel" %}
- kubernetes.pool.flannel
diff --git a/metadata.yml b/metadata.yml
index 3bce5d0..07fabcf 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,3 +1,3 @@
name: "kubernetes"
-version: "2016.8.3"
+version: "2017.1.2"
source: "https://github.com/openstack/salt-formula-kubernetes"