From 453e76b337cafd6b7902ee30315b1a4437b445b2 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 6 Mar 2017 16:59:13 -0800 Subject: [PATCH] app-admin/flannel-wrapper: properly sort unit dependencies When flannel-docker-opts didn't require flanneld, flanneld could fail and flannel-docker-opts would start immediately after. This effectively broke the intended ordering, so now both services require each other. This also simplifies the ordering declarations of the two services by making flannel-docker-opts have both After= and Requires= as is most commonly configured. --- .../app-admin/flannel-wrapper/files/flannel-docker-opts.service | 2 ++ .../app-admin/flannel-wrapper/files/flanneld.service | 1 - ...nel-wrapper-0.7.0.ebuild => flannel-wrapper-0.7.0-r1.ebuild} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/{flannel-wrapper-0.7.0.ebuild => flannel-wrapper-0.7.0-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service index a205427619..853308fd95 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service @@ -2,6 +2,8 @@ Description=flannel docker export service - Network fabric for containers (System Application Container) Documentation=https://github.com/coreos/flannel PartOf=flanneld.service +Requires=flanneld.service +After=flanneld.service Before=docker.service [Service] diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service index e50c7ed331..e6f036ffb4 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service @@ -2,7 +2,6 @@ Description=flannel - Network fabric for containers (System Application Container) Documentation=https://github.com/coreos/flannel After=etcd.service etcd2.service etcd-member.service -Before=docker.service flannel-docker-opts.service Requires=flannel-docker-opts.service [Service] diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0-r1.ebuild