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

Merge pull request #21233 from justinsb/aws_wily

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-20 13:28:08 -08:00
parent 807344da0b 4d2c580781
commit a12a2e984a
5 changed files with 97 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,6 +217,15 @@ net.ipv4.ip_forward:
{% set override_deb='docker-engine_1.8.3-0~vivid_amd64.deb' %}
{% set override_deb_url='http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.8.3-0~vivid_amd64.deb' %}
{% set override_deb_sha1='f0259b1f04635977325c0cfa7c0006e1e5de1341' %}
{% elif grains.get('cloud', '') == 'aws'
and grains.get('os_family', '') == 'Debian'
and grains.get('oscodename', '') == 'wily' -%}
# TODO: Get from google storage?
{% set docker_pkg_name='docker-engine' %}
{% set override_docker_ver='1.8.3-0~wily' %}
{% set override_deb='docker-engine_1.8.3-0~wily_amd64.deb' %}
{% set override_deb_url='http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.8.3-0~wily_amd64.deb' %}
{% set override_deb_sha1='aa00313498e0e8e73d9eedb39cbdff33b1474c16' %}
{% else %}
{% set docker_pkg_name='lxc-docker-1.7.1' %}
{% set override_docker_ver='1.7.1' %}

2
cluster/saltbase/salt/kubelet/default
View File

@@ -117,7 +117,7 @@
{% set kubelet_container= "--kubelet-cgroups=/kubelet" -%}
{% endif %}
{% endif -%}
{% if grains['oscodename'] == 'vivid' -%}
{% if grains['oscodename'] in ['vivid','wily'] -%}
{% set cgroup_root = "--cgroup-root=docker" -%}
{% endif -%}