Merge pull request #9381 from justinsb/aws_support_jessie

AWS: Add support for Vivid Vervet & Debian Jessie
2015-07-09 15:20:37 -07:00
parent ffc5a86098 c78b71d399
commit ee8d2857fc
10 changed files with 194 additions and 13 deletions
--- a/cluster/saltbase/salt/kubelet/default
+++ b/cluster/saltbase/salt/kubelet/default
@@ -75,6 +75,9 @@
  {% set system_container = "--system-container=/system" -%}
  {% set cgroup_root = "--cgroup_root=/" -%}
 {% endif -%}
+{% if grains['oscodename'] == 'vivid' -%}
+  {% set cgroup_root = "--cgroup_root=docker" -%}
+{% endif -%}

 {% set pod_cidr = "" %}
 {% if grains['roles'][0] == 'kubernetes-master' and grains.get('cbr-cidr') %}