]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
ceph-disk: bootstrap-osd keyring ignores --statedir 2635/head
authorLoic Dachary <loic-201408@dachary.org>
Fri, 3 Oct 2014 12:08:57 +0000 (14:08 +0200)
committerLoic Dachary <loic-201408@dachary.org>
Fri, 3 Oct 2014 13:53:28 +0000 (15:53 +0200)
commiteb2f0f497f2b3c4588e0a450122e52dbd82521cd
tree0365aa6562b2827813325dfeb0be15f28b33b80f
parentb1ca1f23ff47857a27f6196c5a050f83f3acc9fc
ceph-disk: bootstrap-osd keyring ignores --statedir

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 <loic-201408@dachary.org>
(cherry picked from commit fa0bd06b4657e5b84e237b76033ac3d3478b6a1f)
src/ceph-disk
src/test/ceph-disk.sh