ceph/ceph — pull request #2635 by dachary (2014-10-03 13:54:20+00:00)
Title: ceph-disk: bootstrap-osd keyring ignores --statedir (giant)

The STATEDIR variable is used to initialize the bootstrap-osd keyring
before it gets a chance to be overriden by --statedir. Replace it with
{statedir} so that it can be substituted after all options have been
parsed.

http://tracker.ceph.com/issues/9653 Fixes: #9653

Signed-off-by: Loic Dachary
(cherry picked from commit fa0bd06b4657e5b84e237b76033ac3d3478b6a1f)