[kubernetes/f20] patch kubelet service file to use docker.service not docker.socket

[Jan Chaloupka]

commit 302989c36e9de63a9bc0531e3006889a87c399c9
Author: Eric Paris <eparis at redhat.com>
Date:   Thu Jan 22 12:02:18 2015 -0500

    patch kubelet service file to use docker.service not docker.socket

 ...r.service-not-docker.socket-in-unit-files.patch |   30 ++++++++++++++++++++
 kubernetes.spec                                    |    5 +++
 2 files changed, 35 insertions(+), 0 deletions(-)
---
diff --git a/Use-docker.service-not-docker.socket-in-unit-files.patch b/Use-docker.service-not-docker.socket-in-unit-files.patch
new file mode 100644
index 0000000..e9f6af3
--- /dev/null
+++ b/Use-docker.service-not-docker.socket-in-unit-files.patch
@@ -0,0 +1,30 @@
+From 388c179f016a11d401dd6bab91e41cbf12003ede Mon Sep 17 00:00:00 2001
+From: Eric Paris <eparis at redhat.com>
+Date: Thu, 22 Jan 2015 11:36:21 -0500
+Subject: [PATCH] Use docker.service not docker.socket in unit files
+
+Some distros, include RHEL and Fedora, are doing away with the docker
+socket by default in systemd units, for security reasons.  Instead rely
+on the docker.service being started instead of socket activation.
+---
+ contrib/init/systemd/kubelet.service | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/init/systemd/kubelet.service b/contrib/init/systemd/kubelet.service
+index 52b5b85..6990f29 100644
+--- a/contrib/init/systemd/kubelet.service
++++ b/contrib/init/systemd/kubelet.service
+@@ -1,8 +1,8 @@
+ [Unit]
+ Description=Kubernetes Kubelet Server
+ Documentation=https://github.com/GoogleCloudPlatform/kubernetes
+-After=docker.socket cadvisor.service
+-Requires=docker.socket
++After=docker.service cadvisor.service
++Requires=docker.service
+ 
+ [Service]
+ EnvironmentFile=-/etc/kubernetes/config
+-- 
+2.1.0
+
diff --git a/kubernetes.spec b/kubernetes.spec
index 0708e27..d7e97f3 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -22,6 +22,8 @@ URL:		https://github.com/GoogleCloudPlatform/kubernetes
 ExclusiveArch:	x86_64
 Source0:	https://github.com/GoogleCloudPlatform/kubernetes/archive/%{commit}/kubernetes-%{shortcommit}.tar.gz
 
+Patch1:		Use-docker.service-not-docker.socket-in-unit-files.patch
+
 %if 0%{?fedora} >= 21 || 0%{?rhel}
 Requires:	docker
 %else
@@ -379,6 +381,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Thu Jan 22 2015 Eric Paris <eparis at redhat.com>
+- patch kubelet service file to use docker.service not docker.socket
+
 * Wed Jan 21 2015 jchaloup <jchaloup at redhat.com> - 0.8.2-0.1.git5b04640
 - Bump to upstream 5b046406a957a1e7eda7c0c86dd7a89e9c94fc5f