client: use `ceph_uid` fact to set uid/gid on admin key

That task is failing on containerized deployment because `ceph:ceph`
doesn't exist.
The idea here is to use the `{{ ceph_uid }}` to set the ownerships for
the admin keyring when containerized_deployment.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1540578

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/2321/merge
Guillaume Abrioux 2018-02-16 09:04:23 +01:00 committed by Sébastien Han
parent 1e1b26ca4d
commit 6d35bc9bde
1 changed files with 14 additions and 1 deletions

View File

@ -20,7 +20,7 @@
- sestatus is defined - sestatus is defined
- sestatus.stdout != 'Disabled' - sestatus.stdout != 'Disabled'
- name: copy ceph admin keyring - name: copy ceph admin keyring when non containerized deployment
copy: copy:
src: "{{ fetch_directory }}/{{ fsid }}/etc/ceph/{{ cluster }}.client.admin.keyring" src: "{{ fetch_directory }}/{{ fsid }}/etc/ceph/{{ cluster }}.client.admin.keyring"
dest: "/etc/ceph/" dest: "/etc/ceph/"
@ -28,5 +28,18 @@
group: "ceph" group: "ceph"
mode: "0600" mode: "0600"
when: when:
- not containerized_deployment
- cephx
- copy_admin_key
- name: copy ceph admin keyring when containerized deployment
copy:
src: "{{ fetch_directory }}/{{ fsid }}/etc/ceph/{{ cluster }}.client.admin.keyring"
dest: "/etc/ceph/"
owner: "{{ ceph_uid }}"
group: "{{ ceph_uid }}"
mode: "0600"
when:
- containerized_deployment
- cephx - cephx
- copy_admin_key - copy_admin_key