mirror of https://github.com/ceph/ceph-ansible.git
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 <gabrioux@ibm.com>
(cherry picked from commit 2eaa9ea66b
)
stable-8.0-test
parent
df8216b0a1
commit
19b460f1de
|
@ -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 }}"
|
||||
|
|
Loading…
Reference in New Issue