github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AWS kube-up: remove support for vivid

Browse Source 
Vivid is EOL, and Docker is no longer packaged for it.

Remove support for it in 1.3 (in 1.2 we had warned users it was EOL).

Also remove unused wheezy, trusty & coreos & do general cleanup.
This commit is contained in:
Justin Santa Barbara
2016-06-18 17:00:48 -04:00
parent a82bcfd58f
commit b8112beb34
11 changed files with 8 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/saltbase/salt/docker/init.sls
View File

@@ -243,16 +243,6 @@ net.ipv4.ip_forward:
{% set override_deb_url='http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.11.2-0~trusty_amd64.deb' %}
{% set override_deb_sha1='022dee31e68c6d572eaac750915786e4a6729d2a' %}
{% elif grains.get('cloud', '') == 'aws'
and grains.get('os_family', '') == 'Debian'
and grains.get('oscodename', '') == 'vivid' -%}
# TODO: Get from google storage?
{% set docker_pkg_name='docker-engine' %}
{% set override_docker_ver='1.9.1-0~vivid' %}
{% set override_deb='docker-engine_1.9.1-0~vivid_amd64.deb' %}
{% set override_deb_url='http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.9.1-0~vivid_amd64.deb' %}
{% set override_deb_sha1='81741f6f16630632de53762c5554238d57b3b9cb' %}
{% elif grains.get('cloud', '') == 'aws'
and grains.get('os_family', '') == 'Debian'
and grains.get('oscodename', '') == 'wily' -%}