diff -Nru ceph-10.2.5/debian/changelog ceph-10.2.5/debian/changelog --- ceph-10.2.5/debian/changelog 2017-01-17 04:10:40.000000000 -0700 +++ ceph-10.2.5/debian/changelog 2017-01-30 09:50:41.000000000 -0700 @@ -1,3 +1,11 @@ +ceph (10.2.5-0ubuntu3) zesty; urgency=medium + + * Start ceph-all after static-network-up (LP: #1636322). + - d/p/start-ceph-all-after-network.patch: add dependency on + the static-network-up event before starting ceph-all. + + -- Billy Olsen Mon, 30 Jan 2017 09:50:25 -0700 + ceph (10.2.5-0ubuntu2) zesty; urgency=medium * d/rules: Install upstream provided systemd targets and ensure they diff -Nru ceph-10.2.5/debian/patches/series ceph-10.2.5/debian/patches/series --- ceph-10.2.5/debian/patches/series 2017-01-14 01:34:51.000000000 -0700 +++ ceph-10.2.5/debian/patches/series 2017-01-30 09:49:54.000000000 -0700 @@ -19,3 +19,4 @@ osd-limit-omap-data-in-push-op.patch rgw_rados-creation_time.patch powerpc_libatomic.patch +start-ceph-all-after-network.patch diff -Nru ceph-10.2.5/debian/patches/start-ceph-all-after-network.patch ceph-10.2.5/debian/patches/start-ceph-all-after-network.patch --- ceph-10.2.5/debian/patches/start-ceph-all-after-network.patch 1969-12-31 17:00:00.000000000 -0700 +++ ceph-10.2.5/debian/patches/start-ceph-all-after-network.patch 2017-01-30 09:49:54.000000000 -0700 @@ -0,0 +1,37 @@ +From e10e22a95f67c31947d4c0f33d69e4d8b929b0e8 Mon Sep 17 00:00:00 2001 +From: Billy Olsen +Date: Mon, 24 Oct 2016 15:13:51 -0700 +Forwarded: https://github.com/ceph/ceph/pull/11631 +Subject: [PATCH 1/1] upstart: start ceph-all after static-network-up + +Starting on runlevel [2345] allows the ceph services to +start before all of the networking is configured. This +introduces a race condition which allows a service to start +before the network it binds to is available. + +Add the static-network-up event as a dependency for the start +on directive in order to start the ceph services after all of +the network stanzas have been processed and executed in the +/etc/network/interfaces and /etc/network/interfaces.d/*.conf +files. + +Fixes: http://tracker.ceph.com/issues/17689 + +Signed-off-by: Billy Olsen +--- + src/upstart/ceph-all.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/upstart/ceph-all.conf b/src/upstart/ceph-all.conf +index c0b0edd..52d0f08 100644 +--- a/src/upstart/ceph-all.conf ++++ b/src/upstart/ceph-all.conf +@@ -1,4 +1,4 @@ + description "Ceph" + +-start on runlevel [2345] ++start on runlevel [2345] and static-network-up + stop on runlevel [!2345] +-- +2.7.4 +