From: John Fulton <fulton@redhat.com>
Date: Thu, 16 Jan 2025 20:50:50 +0000 (-0500)
Subject: Handle adoption when radosgw_address_block is comma delimited list
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0fab225e9857ed7aa233409b2afad784d62d7c94;p=ceph-ansible.git

Handle adoption when radosgw_address_block is comma delimited list

In cephadm-adopt.yml TASK "Update the placement of radosgw hosts"
passes module ceph_orch_apply embedded YAML via a block scalar.
This YAML creates a Ceph spec of service_type RGW. The networks
key of this spec supports either a list or a string. Without this
patch, the networks key of the spec will only contain a string.
With this patch a string is still set for the networks key, but
if Ansible var radosgw_address_block contains commas, then var
radosgw_address_block is split by those commas into a list and
the networks key of the spec will be set to a list.

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

Signed-off-by: John Fulton <fulton@redhat.com>
(cherry picked from commit b0707ae5d884666a7eedcbbdb29c7d57d514456a)
---

diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml
index e542dcdd7..612e5fe86 100644
--- a/infrastructure-playbooks/cephadm-adopt.yml
+++ b/infrastructure-playbooks/cephadm-adopt.yml
@@ -950,7 +950,7 @@
             hosts:
               - {{ ansible_facts['nodename'] }}
           {% if rgw_subnet is defined %}
-          networks: "{{ radosgw_address_block }}"
+          networks: {{ radosgw_address_block.split(',') | list if ',' in radosgw_address_block else radosgw_address_block | string }}
           {% endif %}
           spec:
             rgw_frontend_port: {{ radosgw_frontend_port }}