From f9a18460d33210d8fc14778e056ceaf981211d4f Mon Sep 17 00:00:00 2001 From: Anthony Haussmann Date: Wed, 28 Sep 2016 16:15:18 +0200 Subject: [PATCH] Move kube_version var to defaults Move the variable kube_version to defaults to have the possibility to overwrite it via group_vars inventory if needed. --- roles/download/defaults/main.yml | 2 +- roles/download/tasks/main.yml | 2 -- roles/download/vars/kube_versions.yml | 1 - roles/uploads/defaults/main.yml | 2 +- roles/uploads/tasks/main.yml | 2 -- roles/uploads/vars/kube_versions.yml | 1 - 6 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 roles/download/vars/kube_versions.yml delete mode 100644 roles/uploads/vars/kube_versions.yml diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 51f0b02fd..f1f276c62 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -5,7 +5,7 @@ local_release_dir: /tmp download_run_once: False # Versions -include_vars: kube_versions.yml +kube_version: v1.3.0 etcd_version: v3.0.6 #TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults diff --git a/roles/download/tasks/main.yml b/roles/download/tasks/main.yml index 9b9caf126..9e97770cb 100644 --- a/roles/download/tasks/main.yml +++ b/roles/download/tasks/main.yml @@ -1,6 +1,4 @@ --- -- include_vars: kube_versions.yml - - name: downloading... debug: msg: "{{ download.url }}" diff --git a/roles/download/vars/kube_versions.yml b/roles/download/vars/kube_versions.yml deleted file mode 100644 index 1ea3eb24f..000000000 --- a/roles/download/vars/kube_versions.yml +++ /dev/null @@ -1 +0,0 @@ -kube_version: v1.3.0 diff --git a/roles/uploads/defaults/main.yml b/roles/uploads/defaults/main.yml index ad6865da2..30c71d76b 100644 --- a/roles/uploads/defaults/main.yml +++ b/roles/uploads/defaults/main.yml @@ -2,7 +2,7 @@ local_release_dir: /tmp # Versions -include_vars: kube_versions.yml +kube_version: v1.3.0 etcd_version: v3.0.6 calico_version: v0.20.0 diff --git a/roles/uploads/tasks/main.yml b/roles/uploads/tasks/main.yml index 68fcd4320..2d6000599 100644 --- a/roles/uploads/tasks/main.yml +++ b/roles/uploads/tasks/main.yml @@ -1,6 +1,4 @@ --- -- include_vars: "kube_versions.yml" - - name: Create dest directories file: path={{local_release_dir}}/{{item.dest|dirname}} state=directory recurse=yes with_items: '{{downloads}}' diff --git a/roles/uploads/vars/kube_versions.yml b/roles/uploads/vars/kube_versions.yml deleted file mode 100644 index 1ea3eb24f..000000000 --- a/roles/uploads/vars/kube_versions.yml +++ /dev/null @@ -1 +0,0 @@ -kube_version: v1.3.0