Browse Source

Merge pull request #522 from anthonyhaussman/KubeVersionDefaults

Move kube_version var to defaults
pull/523/merge
Smaine Kahlouch 8 years ago
committed by GitHub
parent
commit
648aa7422d
6 changed files with 2 additions and 8 deletions
  1. 2
      roles/download/defaults/main.yml
  2. 2
      roles/download/tasks/main.yml
  3. 1
      roles/download/vars/kube_versions.yml
  4. 2
      roles/uploads/defaults/main.yml
  5. 2
      roles/uploads/tasks/main.yml
  6. 1
      roles/uploads/vars/kube_versions.yml

2
roles/download/defaults/main.yml

@ -5,7 +5,7 @@ local_release_dir: /tmp
download_run_once: False download_run_once: False
# Versions # Versions
include_vars: kube_versions.yml
kube_version: v1.3.0
etcd_version: v3.0.6 etcd_version: v3.0.6
#TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults #TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults

2
roles/download/tasks/main.yml

@ -1,6 +1,4 @@
--- ---
- include_vars: kube_versions.yml
- name: downloading... - name: downloading...
debug: debug:
msg: "{{ download.url }}" msg: "{{ download.url }}"

1
roles/download/vars/kube_versions.yml

@ -1 +0,0 @@
kube_version: v1.3.0

2
roles/uploads/defaults/main.yml

@ -2,7 +2,7 @@
local_release_dir: /tmp local_release_dir: /tmp
# Versions # Versions
include_vars: kube_versions.yml
kube_version: v1.3.0
etcd_version: v3.0.6 etcd_version: v3.0.6
calico_version: v0.20.0 calico_version: v0.20.0

2
roles/uploads/tasks/main.yml

@ -1,6 +1,4 @@
--- ---
- include_vars: "kube_versions.yml"
- name: Create dest directories - name: Create dest directories
file: path={{local_release_dir}}/{{item.dest|dirname}} state=directory recurse=yes file: path={{local_release_dir}}/{{item.dest|dirname}} state=directory recurse=yes
with_items: '{{downloads}}' with_items: '{{downloads}}'

1
roles/uploads/vars/kube_versions.yml

@ -1 +0,0 @@
kube_version: v1.3.0
Loading…
Cancel
Save