]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph-nfs: fix ceph_nfs_ceph_user variable
authorDimitri Savineau <dsavinea@redhat.com>
Mon, 10 Feb 2020 16:06:48 +0000 (11:06 -0500)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 17 Feb 2020 09:56:05 +0000 (10:56 +0100)
The ceph_nfs_ceph_user variable is a string for the ceph-nfs role but a
list in ceph-client role.
6a6785b introduced a confusion between both variable type in the ceph-nfs
role for external ceph with ganesha.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1801319
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
roles/ceph-nfs/tasks/main.yml

index 5f071f5337105d0af3cd6972ba12084dd4022abe..a2b18fd395b70529c748c42205f05a68ad0a80cf 100644 (file)
@@ -28,7 +28,7 @@
 
 - name: copy rgw keyring when deploying internal ganesha with external ceph cluster
   copy:
-    src: "/etc/ceph/{{ cluster }}.{{ ceph_nfs_ceph_user.name }}.keyring"
+    src: "/etc/ceph/{{ cluster }}.{{ ceph_nfs_ceph_user }}.keyring"
     dest: "/var/lib/ceph/radosgw/{{ cluster }}-rgw.{{ ansible_hostname }}/keyring"
     mode: '0600'
     owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"