commit 17ac08d938d53f47782a999ead5717c1969a128b
author Jakub Josef <jjosef@mirantis.com> Mon Jan 29 12:45:41 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Mon Jan 29 12:45:41 2018 +0000
tree cd2361682bcde09edfd24f1ee2bf5378b0c9e6c3
parent 435ae8c9c73a01baf455b976d47f295195757f09
parent 02f5863f203a4ef1f37aef1f1f620c1f9a4abf42

Merge "Fixed calico checksum in master-cluster test"

kubernetes/master/calico.sls

diff --git a/kubernetes/master/calico.sls b/kubernetes/master/calico.sls
index 7f58c62..3522fb3 100644
--- a/kubernetes/master/calico.sls
+++ b/kubernetes/master/calico.sls
@@ -21,9 +21,21 @@
     - dir_mode: 755
     - template: jinja
 
+/tmp/calico/master/:
+  file.directory:
+      - user: root
+      - group: root
+      - makedirs: True
+
+download_calicoctl:
+  cmd.run:
+     - name: wget -P /tmp/calico/master/ {{ master.network.get('source', 'https://github.com/projectcalico/calico-containers/releases/download/') }}{{ master.network.version }}/calicoctl
+     - require:
+       - file: /tmp/calico/master/
+
 /usr/bin/calicoctl:
   file.managed:
-     - source: {{ master.network.get('source', 'https://github.com/projectcalico/calico-containers/releases/download/') }}{{ master.network.version }}/calicoctl
+     - source: /tmp/calico/master/calicoctl
      - source_hash: md5={{ master.network.hash }}
      - mode: 751
      - user: root

tests/pillar/master_cluster.sls

diff --git a/tests/pillar/master_cluster.sls b/tests/pillar/master_cluster.sls
index 2f40293..a75c173 100644
--- a/tests/pillar/master_cluster.sls
+++ b/tests/pillar/master_cluster.sls
@@ -69,9 +69,9 @@
       allow_privileged: true
     network:
       engine: calico
-      hash: fb5e30ebe6154911a66ec3fb5f1195b2
+      hash: 9D8F997FEE542420B15986FEA0EDF253
       private_ip_range: 10.150.0.0/16
-      version: v0.19.0
+      version: v1.6.3
       etcd:
         members:
         - host: 127.0.0.1