Merge pull request #3037 from okamototk/fix_skipdownload

Fixed checking skip_downloads condition.

Merge pull request #3037 from okamototk/fix_skipdownload
f6189885 · Rong Zhang · GitHub · 5c039d87 · 1f7a42f3 · f6189885
Unverified Commit f6189885 authored 6 years ago by Rong Zhang Committed by GitHub 6 years ago
--- a/cluster.yml
+++ b/cluster.yml
@@ -37,7 +37,7 @@
    - role: rkt
      tags: rkt
      when: "'rkt' in [etcd_deployment_type, kubelet_deployment_type, vault_deployment_type]"
-    - { role: download, tags: download, skip_downloads: false }
+    - { role: download, tags: download, when: "skip_downloads == 'false'" }
  environment: "{{proxy_env}}"

 - hosts: etcd:k8s-cluster:vault:calico-rr

--- a/scale.yml
+++ b/scale.yml
@@ -32,7 +32,7 @@
    - role: rkt
      tags: rkt
      when: "'rkt' in [etcd_deployment_type, kubelet_deployment_type, vault_deployment_type]"
-    - { role: download, tags: download, skip_downloads: false }
+    - { role: download, tags: download, when: "skip_downloads == 'false'" }
    - { role: etcd, tags: etcd, etcd_cluster_setup: false }
    - { role: vault, tags: vault, when: "cert_management == 'vault'"}
    - { role: kubernetes/node, tags: node }

--- a/upgrade-cluster.yml
+++ b/upgrade-cluster.yml
@@ -38,7 +38,7 @@
    - role: rkt
      tags: rkt
      when: "'rkt' in [etcd_deployment_type, kubelet_deployment_type, vault_deployment_type]"
-    - { role: download, tags: download, skip_downloads: false }
+    - { role: download, tags: download, when: "skip_downloads == 'false'" }
  environment: "{{proxy_env}}"

 - hosts: etcd:k8s-cluster:vault