From 5ef5fcd0b64ed1a0fe4ffb1750984d29599839a4 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 11 Jul 2018 16:03:10 +0200 Subject: [PATCH] client: do not rely on copy_admin_key to import keys Relying on `copy_admin_key` to import created keys on client nodes makes us obliged to copy admin key on those nodes which is not something we might want. We should use the fact `condition_copy_admin_key` which will be set to `True` when the delegated node is a mon which means we can import keys without taking care of admin keyring. Fixes: #2867 Signed-off-by: Guillaume Abrioux --- roles/ceph-client/tasks/create_users_keys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ceph-client/tasks/create_users_keys.yml b/roles/ceph-client/tasks/create_users_keys.yml index 91b1d8afd..ca7e49364 100644 --- a/roles/ceph-client/tasks/create_users_keys.yml +++ b/roles/ceph-client/tasks/create_users_keys.yml @@ -50,7 +50,7 @@ containerized: "{{ docker_exec_cmd | default('') }}" cluster: "{{ cluster }}" dest: "{{ ceph_conf_key_directory }}" - import_key: "{{ copy_admin_key }}" + import_key: "{{ condition_copy_admin_key }}" mode: "{{ item.mode|default(omit) }}" with_items: "{{ keys }}" delegate_to: "{{ delegated_node }}"