diff -Nru ceph-0.80.11/debian/changelog ceph-0.80.11/debian/changelog --- ceph-0.80.11/debian/changelog 2016-01-27 20:04:45.000000000 -0700 +++ ceph-0.80.11/debian/changelog 2016-11-14 03:48:59.000000000 -0700 @@ -1,3 +1,11 @@ +ceph (0.80.11-0ubuntu1.14.04.1~cloud1) precise-icehouse; 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, 14 Nov 2016 03:48:13 -0700 + ceph (0.80.11-0ubuntu1.14.04.1~cloud0) precise-icehouse; urgency=medium * New upstream release for the Ubuntu Cloud Archive. diff -Nru ceph-0.80.11/debian/patches/series ceph-0.80.11/debian/patches/series --- ceph-0.80.11/debian/patches/series 2016-01-18 05:06:10.000000000 -0700 +++ ceph-0.80.11/debian/patches/series 2016-11-14 03:46:21.000000000 -0700 @@ -1,3 +1,4 @@ virtualenv-never-download modules.patch increaseFileLimit.patch +start-ceph-all-after-network.patch diff -Nru ceph-0.80.11/debian/patches/start-ceph-all-after-network.patch ceph-0.80.11/debian/patches/start-ceph-all-after-network.patch --- ceph-0.80.11/debian/patches/start-ceph-all-after-network.patch 1969-12-31 17:00:00.000000000 -0700 +++ ceph-0.80.11/debian/patches/start-ceph-all-after-network.patch 2016-11-14 03:46:21.000000000 -0700 @@ -0,0 +1,36 @@ +From e10e22a95f67c31947d4c0f33d69e4d8b929b0e8 Mon Sep 17 00:00:00 2001 +From: Billy Olsen +Date: Mon, 24 Oct 2016 15:13:51 -0700 +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 +