From 6c27240761862ebceac05b979b36b2b713ca1b90 Mon Sep 17 00:00:00 2001 From: James Page Date: Tue, 10 Jul 2018 09:28:40 +0100 Subject: [PATCH] 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 --- actions/add_disk.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/actions/add_disk.py b/actions/add_disk.py index 78c7b5e4..9ba49116 100755 --- a/actions/add_disk.py +++ b/actions/add_disk.py @@ -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)