From e2ed87a783daea854500df6c591b45ef9f244a46 Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Tue, 14 Apr 2015 16:37:47 -0700 Subject: [PATCH] flannel: remove wants etcd and add requires etcd2 --- .../coreos-overlay/app-admin/flannel/files/flanneld.service | 3 +-- .../flannel/{flannel-0.3.1.ebuild => flannel-0.3.1-r1.ebuild} | 0 2 files changed, 1 insertion(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel/{flannel-0.3.1.ebuild => flannel-0.3.1-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service index ca5b4cec0e..e5fa56e2e6 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service @@ -1,9 +1,8 @@ [Unit] Description=Network fabric for containers Documentation=https://github.com/coreos/flannel -Wants=etcd.service Requires=early-docker.service -After=etcd.service early-docker.service +After=etcd.service etcd2.service early-docker.service Before=early-docker.target [Service] diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.1-r1.ebuild