From 89900fa19b03d8e2f1599bba02b1d4cafe2d8a01 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Tue, 16 Jun 2015 18:25:18 -0400
Subject: [PATCH] AWS: Ubuntu Vivid, set cgroup_root to docker

Otherwise libcontainer generates systemd unit file names that start with "-",
which are not valid.
---
 cluster/saltbase/salt/kubelet/default | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default
index 40c3d2b9893..0c9c023a628 100644
--- 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') %}