Handle radosgw hosts placement with non-default cluster name

In cephadm-adopt.yml TASK "Update the placement of radosgw hosts"
does not handle when Ansible var cluster is something other than
"ceph", unless this patch is used.

If cluster is set to something other than "ceph", then pass
use extra_container_args to mount the admin keyring with a
non-default name into the container with the default name.
If cluster has the default value, or is unset, then the var
extra_container_args is unchanged.

This patch is necessary to migrate older clusters which were
deployed when custom names were supported.

Closes: https://issues.redhat.com/browse/RHCEPH-10442

Signed-off-by: John Fulton <[email protected]>

infrastructure-playbooks/cephadm-adopt.yml

@@ -960,6 +960,10 @@
           extra_container_args:
             - -v
             - /etc/pki/ca-trust:/etc/pki/ca-trust:ro
+            {% if cluster | default("ceph") != "ceph" -%}
+            - -v
+            - /etc/ceph/{{ cluster }}.client.admin.keyring:/etc/ceph/ceph.client.admin.keyring
+            {% endif %}
       delegate_to: "{{ groups[mon_group_name][0] }}"
       environment:
         CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'