From 0a5f6f0afb295d0cfad160c2a523c8bd8126d356 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Wed, 16 Nov 2016 11:57:23 -0800 Subject: [PATCH] app-admin/flannel-wrapper: use oneshot for opts docker.service shouldn't be allowed to run until flannel-docker-opts.service _finishes_ (since it is actually writing the flags for Docker). --- .../flannel-wrapper/files/flannel-docker-opts.service | 4 +--- ...nnel-wrapper-0.0.1.ebuild => flannel-wrapper-0.0.2.ebuild} | 0 2 files changed, 1 insertion(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/{flannel-wrapper-0.0.1.ebuild => flannel-wrapper-0.0.2.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 c089910c91..41a0d8efd0 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 @@ -6,9 +6,7 @@ PartOf=flannel.service Before=docker.service [Service] -Type=simple -Restart=on-failure -RestartSec=10 +Type=oneshot TimeoutStartSec=60 Environment="FLANNEL_IMAGE_TAG=v0.6.2" diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.0.2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.0.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.0.2.ebuild