From c4b3520730612da10e6d7f3c61ce0a5446725e47 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 4 Apr 2024 10:53:12 +0200 Subject: [PATCH] ceph-mon: fix admin keyring creation task Although custom cluster name support was dropped, it breaks ceph-volume functional testing as it uses "test" as cluster name. The plan is to make ceph-volume use "ceph" but for now it's easier to address the issue in this task. Signed-off-by: Guillaume Abrioux --- roles/ceph-mon/tasks/deploy_monitors.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/ceph-mon/tasks/deploy_monitors.yml b/roles/ceph-mon/tasks/deploy_monitors.yml index 3c2a8e4a3..eed7287fb 100644 --- a/roles/ceph-mon/tasks/deploy_monitors.yml +++ b/roles/ceph-mon/tasks/deploy_monitors.yml @@ -92,7 +92,7 @@ - name: Create admin keyring ceph_authtool: name: client.admin - path: /etc/ceph/ceph.client.admin.keyring + path: "/etc/ceph/{{ cluster }}.client.admin.keyring" owner: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}" group: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}" mode: "0400" @@ -138,7 +138,7 @@ owner: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}" group: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}" mode: "0400" - import_keyring: /etc/ceph/ceph.client.admin.keyring + import_keyring: "/etc/ceph/{{ cluster }}.client.admin.keyring" environment: CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else None }}" CEPH_CONTAINER_BINARY: "{{ container_binary }}"