Merge branch 'testing' into next

src/Makefile.am

@@ -1080,7 +1080,7 @@ EXTRA_DIST += \
 	$(ceph_tool_gui_DATA) \
 	$(srcdir)/test/encoding/readable.sh \
 	$(srcdir)/test/encoding/check-generated.sh \
-	$(srcdir)/upstart/ceph.conf \
+	$(srcdir)/upstart/ceph-all.conf \
 	$(srcdir)/upstart/ceph-mon.conf \
 	$(srcdir)/upstart/ceph-mon-all.conf \
 	$(srcdir)/upstart/ceph-mon-all-starter.conf \

src/mkcephfs.in

@@ -325,7 +325,7 @@ if [ -n "$prepareosdfs" ]; then
         # try to fallback to to old keys
         get_conf tmp_devs "" "btrfs devs"
         if [ -n "$tmp_devs" ]; then
-            fs_type = "btrfs"
+            fs_type="btrfs"
         else
             echo No filesystem type defined!
             exit 0

src/upstart/ceph-mds-all.conf

@@ -1,4 +1,4 @@
 description "Ceph MDS (all instances)"
 
-start on starting ceph
-stop on stopping ceph
+start on starting ceph-all
+stop on stopping ceph-all

src/upstart/ceph-mon-all.conf

@@ -1,4 +1,4 @@
 description "Ceph monitor (all instances)"
 
-start on starting ceph
-stop on runlevel [!2345] or stopping ceph
+start on starting ceph-all
+stop on runlevel [!2345] or stopping ceph-all

src/upstart/ceph-osd-all.conf

@@ -1,4 +1,4 @@
 description "Ceph OSD (all instances)"
 
-start on starting ceph
-stop on runlevel [!2345] or stopping ceph
+start on starting ceph-all
+stop on runlevel [!2345] or stopping ceph-all

src/upstart/radosgw-all.conf

@@ -1,4 +1,4 @@
 description "Ceph radosgw (all instances)"
 
-start on starting ceph
-stop on runlevel [!2345] or stopping ceph
+start on starting ceph-all
+stop on runlevel [!2345] or stopping ceph-all

src/upstart/radosgw.conf

@@ -1,6 +1,6 @@
 description "Ceph radosgw"
 
-start on radosgw
+start on radosgw-all
 stop on runlevel [!2345] or stopping radosgw-all
 
 respawn