init-ceph: Make sure daemon_is_running() checks the correct instance

init-ceph: Make sure daemon_is_running() checks the correct instance

When starting multiple instances of a daemon on a single host,
for unknown reasons /var/run/ceph/$type.$id.pid can hold a pid
for which /proc/$pid/cmdline identifies the right type of daemon,
but the wrong instance.  When this happens, all the configured
instances of a daemon are not running, but repeated invocations
of "init-ceph start" do not start the missing instances.

So, check for the correct daemon instance id as well as type when
testing if the daemon is up.

Signed-off-by: Jim Schutt <jaschut@sandia.gov>
Signed-off-by: Sage Weil <sage@newdream.net>