ceph-mon: remove hardcoded ipv4 in containers

Before this commit we were forcing ipv4 which might not be available.
Now setting ip_version to ipv4 or ipv6 will give you the right support.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1484189
Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-mon/tasks/docker/main.yml b/roles/ceph-mon/tasks/docker/main.yml
index 1b5291526a7cd7fa90045118e9a665fcdd8edfc0..8813295fd385e66467c74c02dd37c16f4ae0699b 100644 (file)
--- a/roles/ceph-mon/tasks/docker/main.yml
+++ b/roles/ceph-mon/tasks/docker/main.yml
@@ -8,14 +8,25 @@
   delay: 15
   until: monitor_socket.rc == 0
 
-- name: force peer addition as potential bootstrap peer for cluster bringup
+- name: ipv4 - force peer addition as potential bootstrap peer for cluster bringup
   command: docker exec ceph-mon-{{ ansible_hostname }} ceph --admin-daemon /var/run/ceph/{{ cluster }}-mon.{{ monitor_name }}.asok add_bootstrap_peer_hint {{ hostvars[item]['ansible_' + monitor_interface].ipv4.address }}
   with_items: "{{ groups[mon_group_name] }}"
   changed_when: false
   failed_when: false
   when:
-    - "{{ inventory_hostname == groups[mon_group_name][0] }}"
+    - inventory_hostname == groups[mon_group_name][0]
     - not containerized_deployment_with_kv
+    - ip_version == 'ipv4'
+
+- name: ipv6 - force peer addition as potential bootstrap peer for cluster bringup
+  command: docker exec ceph-mon-{{ ansible_hostname }} ceph --admin-daemon /var/run/ceph/{{ cluster }}-mon.{{ monitor_name }}.asok add_bootstrap_peer_hint [{{ hostvars[item]['ansible_' + monitor_interface].ipv6[0].address }}]
+  with_items: "{{ groups[mon_group_name] }}"
+  changed_when: false
+  failed_when: false
+  when:
+    - inventory_hostname == groups[mon_group_name][0]
+    - not containerized_deployment_with_kv
+    - ip_version == 'ipv6'
 
 - include: copy_configs.yml
   when: not containerized_deployment_with_kv