github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

AWS: Ubuntu Vivid, set cgroup_root to docker

Browse Source 
Otherwise libcontainer generates systemd unit file names that start with "-",
which are not valid.
This commit is contained in:
Justin Santa Barbara 2015-06-16 18:25:18 -04:00
parent bdb2196abe
commit 89900fa19b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,9 @@
{% set system_container = "--system-container=/system" -%} {% set system_container = "--system-container=/system" -%}
{% set cgroup_root = "--cgroup_root=/" -%} {% set cgroup_root = "--cgroup_root=/" -%}
{% endif -%} {% endif -%}
{% if grains['oscodename'] == 'vivid' -%}
{% set cgroup_root = "--cgroup_root=docker" -%}
{% endif -%}
{% set pod_cidr = "" %} {% set pod_cidr = "" %}
{% if grains['roles'][0] == 'kubernetes-master' and grains.get('cbr-cidr') %} {% if grains['roles'][0] == 'kubernetes-master' and grains.get('cbr-cidr') %}