add-disk: Ensure key-manager config is passed to osdize

Recent changes to support vault for key management require that
the 'osd-encrypt-keymanager' is passed to all osdize calls so
that the correct key management approach is taken.

Ensure that the add-disk action does the same, otherwise keys
will always be stored in the ceph mon KV store, rather than
in Vault.

Closes-Bug: 1780920

Change-Id: I8c722d38d68f13dc00c7444a50d67ce37fbd6a29
This commit is contained in:
James Page 2018-07-10 09:28:40 +01:00
parent ec8bcd5f9d
commit 6c27240761
1 changed files with 2 additions and 1 deletions

View File

@ -33,7 +33,8 @@ def add_device(request, device_path, bucket=None):
ceph_hooks.get_journal_devices(),
hookenv.config('ignore-device-errors'),
hookenv.config('osd-encrypt'),
hookenv.config('bluestore'))
hookenv.config('bluestore'),
hookenv.config('osd-encrypt-keymanager'))
# Make it fast!
if hookenv.config('autotune'):
ceph.utils.tune_dev(dev)