From 665ce82d7172f267c1ca1d2119f75cdc6e634b94 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Fri, 9 Dec 2016 10:33:04 +0100 Subject: [PATCH] Move kube_version to group_vars/all to allow easier changing of version Also allows to perform version dependent logic in Ansible roles. --- inventory/group_vars/all.yml | 3 +++ roles/download/defaults/main.yml | 2 -- roles/uploads/defaults/main.yml | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 27489b85b..73f0fb55a 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -4,6 +4,9 @@ bootstrap_os: none # Directory where the binaries will be installed bin_dir: /usr/local/bin +## Change this to use another Kubernetes version, e.g. a current beta release +kube_version: 1.4.6 + # Where the binaries will be downloaded. # Note: ensure that you've enough disk space (about 1G) local_release_dir: "/tmp/releases" diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 057e6bc48..0fdb97897 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -15,8 +15,6 @@ download_compress: 9 download_localhost: False # Versions -kube_version: v1.4.6 - etcd_version: v3.0.6 #TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults # after migration to container download diff --git a/roles/uploads/defaults/main.yml b/roles/uploads/defaults/main.yml index 06d262c9e..8ad7b6021 100644 --- a/roles/uploads/defaults/main.yml +++ b/roles/uploads/defaults/main.yml @@ -2,8 +2,6 @@ local_release_dir: /tmp # Versions -kube_version: v1.4.6 - etcd_version: v3.0.6 calico_version: v0.23.0 calico_cni_version: v1.4.2