From 61001660bb837d5c87588cab2cc8e8b64a3a8002 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 2 Nov 2020 15:56:28 +0100 Subject: [PATCH] common: follow up on #5948 In addition to f7e2b2c608eef4bbba47586f1e24d6ade1572758 Signed-off-by: Guillaume Abrioux (cherry picked from commit 371d854a5c03cfb30d27d5cdbaaad61f7f8d6c58) --- roles/ceph-client/tasks/create_users_keys.yml | 6 +++--- roles/ceph-osd/tasks/openstack_config.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/ceph-client/tasks/create_users_keys.yml b/roles/ceph-client/tasks/create_users_keys.yml index ddf84086f..64d68ab27 100644 --- a/roles/ceph-client/tasks/create_users_keys.yml +++ b/roles/ceph-client/tasks/create_users_keys.yml @@ -39,9 +39,9 @@ cluster: "{{ cluster }}" dest: "{{ ceph_conf_key_directory }}" import_key: "{{ admin_key_presence }}" - mode: "{{ item.mode|default(omit) }}" - owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}" - group: "{{ ceph_uid if containerized_deployment else 'ceph' }}" + mode: "{{ item.mode | default(ceph_keyring_permissions) }}" + owner: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}" + group: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}" environment: CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}" CEPH_CONTAINER_BINARY: "{{ container_binary }}" diff --git a/roles/ceph-osd/tasks/openstack_config.yml b/roles/ceph-osd/tasks/openstack_config.yml index b0bf8a758..64ea152a1 100644 --- a/roles/ceph-osd/tasks/openstack_config.yml +++ b/roles/ceph-osd/tasks/openstack_config.yml @@ -97,7 +97,7 @@ caps: "{{ item.caps }}" secret: "{{ item.key | default('') }}" cluster: "{{ cluster }}" - mode: "{{ item.mode|default(omit) }}" + mode: "{{ item.mode | default(ceph_keyring_permissions) }}" environment: CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}" CEPH_CONTAINER_BINARY: "{{ container_binary }}" -- 2.39.5