]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
ceph-disk: bootstrap-osd keyring ignores --statedir 2634/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:47:53 +0000 (15:47 +0200)
commit5a5e7e7bcedbccbe4ae8aab159af6d8615eb3887
tree39422c6b62e9e49a1c591662d439c3881cc113a8
parent711a7e6f81983ff2091caa0f232af914a04a041c
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