ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <gabrioux@redhat.com>
(cherry picked from commit 5ef5fcd0b6)
pull/2891/head
Guillaume Abrioux 2018-07-11 16:03:10 +02:00 committed by mergify[bot]
parent aee48a40a4
commit 3b74a6919c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ceph-client/tasks/create_users_keys.yml
View File

@ -50,7 +50,7 @@
containerized: "{{ docker_exec_cmd | default('') }}" containerized: "{{ docker_exec_cmd | default('') }}"
cluster: "{{ cluster }}" cluster: "{{ cluster }}"
dest: "{{ ceph_conf_key_directory }}" dest: "{{ ceph_conf_key_directory }}"
import_key: "{{ copy_admin_key }}" import_key: "{{ condition_copy_admin_key }}"
mode: "{{ item.mode|default(omit) }}" mode: "{{ item.mode|default(omit) }}"
with_items: "{{ keys }}" with_items: "{{ keys }}"
delegate_to: "{{ delegated_node }}" delegate_to: "{{ delegated_node }}"