From: Guillaume Abrioux Date: Wed, 24 Jan 2018 13:06:47 +0000 (+0100) Subject: Revert "monitor_interface: document need to use monitor_address when using IPv6" X-Git-Tag: v3.0.22~6 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=54a95bec106a2942d6ed1f97ec1125cf53adf79f;p=ceph-ansible.git Revert "monitor_interface: document need to use monitor_address when using IPv6" This reverts commit 10b91661ceef7992354032030c7c2673a90d40f4. This reverts also the same comment added in 1359869497a44df0c3b4157f41453b84326b58e7 (cherry picked from commit f1232b33fd7a8da53aa2e1ad2b11ee16109633b3) Signed-off-by: Sébastien Han --- diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 2a75fa6bb..cd70fdad1 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -312,7 +312,6 @@ dummy: # These variables must be defined at least in all.yml and overrided if needed (inventory host file or group_vars/*.yml). # Eg. If you want to specify for each monitor which address the monitor will bind to you can set it in your **inventory host file** by using 'monitor_address' variable. # Preference will go to monitor_address if both monitor_address and monitor_interface are defined. -# To use an IPv6 address, use the monitor_address setting instead (and set ip_version to ipv6) #monitor_interface: interface #monitor_address: 0.0.0.0 #monitor_address_block: subnet @@ -357,7 +356,6 @@ dummy: # These variables must be defined at least in all.yml and overrided if needed (inventory host file or group_vars/*.yml). # Eg. If you want to specify for each radosgw node which address the radosgw will bind to you can set it in your **inventory host file** by using 'radosgw_address' variable. # Preference will go to radosgw_address if both radosgw_address and radosgw_interface are defined. -# To use an IPv6 address, use the radosgw_address setting instead (and set ip_version to ipv6) #radosgw_interface: interface #radosgw_address: "{{ '0.0.0.0' if rgw_containerized_deployment else 'address' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 #radosgw_address_block: subnet diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index f95d195b2..9ece6abf5 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -312,7 +312,6 @@ ceph_repository: rhcs # These variables must be defined at least in all.yml and overrided if needed (inventory host file or group_vars/*.yml). # Eg. If you want to specify for each monitor which address the monitor will bind to you can set it in your **inventory host file** by using 'monitor_address' variable. # Preference will go to monitor_address if both monitor_address and monitor_interface are defined. -# To use an IPv6 address, use the monitor_address setting instead (and set ip_version to ipv6) #monitor_interface: interface #monitor_address: 0.0.0.0 #monitor_address_block: subnet @@ -357,7 +356,6 @@ ceph_repository: rhcs # These variables must be defined at least in all.yml and overrided if needed (inventory host file or group_vars/*.yml). # Eg. If you want to specify for each radosgw node which address the radosgw will bind to you can set it in your **inventory host file** by using 'radosgw_address' variable. # Preference will go to radosgw_address if both radosgw_address and radosgw_interface are defined. -# To use an IPv6 address, use the radosgw_address setting instead (and set ip_version to ipv6) #radosgw_interface: interface #radosgw_address: "{{ '0.0.0.0' if rgw_containerized_deployment else 'address' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 #radosgw_address_block: subnet diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 0721f5bb5..82d3f0322 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -304,7 +304,6 @@ rbd_client_admin_socket_path: /var/run/ceph # must be writable by QEMU and allow # These variables must be defined at least in all.yml and overrided if needed (inventory host file or group_vars/*.yml). # Eg. If you want to specify for each monitor which address the monitor will bind to you can set it in your **inventory host file** by using 'monitor_address' variable. # Preference will go to monitor_address if both monitor_address and monitor_interface are defined. -# To use an IPv6 address, use the monitor_address setting instead (and set ip_version to ipv6) monitor_interface: interface monitor_address: 0.0.0.0 monitor_address_block: subnet @@ -349,7 +348,6 @@ radosgw_civetweb_options: "num_threads={{ radosgw_civetweb_num_threads }}" # These variables must be defined at least in all.yml and overrided if needed (inventory host file or group_vars/*.yml). # Eg. If you want to specify for each radosgw node which address the radosgw will bind to you can set it in your **inventory host file** by using 'radosgw_address' variable. # Preference will go to radosgw_address if both radosgw_address and radosgw_interface are defined. -# To use an IPv6 address, use the radosgw_address setting instead (and set ip_version to ipv6) radosgw_interface: interface radosgw_address: "{{ '0.0.0.0' if rgw_containerized_deployment else 'address' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 radosgw_address_block: subnet