defaults: change monitor|radosgw_address default values

To avoid confusion, let's change the default value from `0.0.0.0` to
`x.x.x.x`.
Users might think setting `0.0.0.0` will make the daemon binding on all
interfaces.

Fixes: #4827
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit fc02fc98ebce0f99e81628e76ad28e7bf65435de)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 861a7b5d0cbd49df969e78a3021d970c2b60a785..bbbc3b9faead47c38ebc7c7a5d85bf414dedbbd1 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -324,7 +324,7 @@ dummy:
 # 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.
 #monitor_interface: interface
-#monitor_address: 0.0.0.0
+#monitor_address: x.x.x.x
 #monitor_address_block: subnet
 # set to either ipv4 or ipv6, whichever your network is using
 #ip_version: ipv4

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index d197aa9de07eace57b16ff8ad9a1f2cd465b735e..1db6fe0f98c5dc9743c2890957ea23ddee67d6be 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -324,7 +324,7 @@ ceph_iscsi_config_dev: false
 # 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.
 #monitor_interface: interface
-#monitor_address: 0.0.0.0
+#monitor_address: x.x.x.x
 #monitor_address_block: subnet
 # set to either ipv4 or ipv6, whichever your network is using
 #ip_version: ipv4

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index abeb7500709e39f2c5f61d74880fa98cd7e319ef..aaa78098ded529b1867780203df1a2daf4140ff6 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -316,7 +316,7 @@ rbd_client_admin_socket_path: /var/run/ceph # must be writable by QEMU and allow
 # 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.
 monitor_interface: interface
-monitor_address: 0.0.0.0
+monitor_address: x.x.x.x
 monitor_address_block: subnet
 # set to either ipv4 or ipv6, whichever your network is using
 ip_version: ipv4
@@ -411,7 +411,7 @@ radosgw_thread_pool_size: 512
 # 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.
 radosgw_interface: interface
-radosgw_address: 0.0.0.0
+radosgw_address: x.x.x.x
 radosgw_address_block: subnet
 radosgw_keystone_ssl: false # activate this when using keystone PKI keys
 radosgw_num_instances: 1

diff --git a/roles/ceph-facts/tasks/set_monitor_address.yml b/roles/ceph-facts/tasks/set_monitor_address.yml
index 201880737de9e49f68c7ae1e68b7ff43de6ec8d0..aee025aab8d130aa5f096293929d1231911f4314 100644 (file)
--- a/roles/ceph-facts/tasks/set_monitor_address.yml
+++ b/roles/ceph-facts/tasks/set_monitor_address.yml
@@ -26,7 +26,7 @@
   when:
     - "item not in _monitor_addresses | default([]) | selectattr('name', 'defined') | map(attribute='name') | list"
     - hostvars[item]['monitor_address'] is defined
-    - hostvars[item]['monitor_address'] != '0.0.0.0'
+    - hostvars[item]['monitor_address'] != 'x.x.x.x'
 
 - name: set_fact _monitor_address to monitor_interface - ipv4
   set_fact:
@@ -36,7 +36,7 @@
     - "item not in _monitor_addresses | default([]) | selectattr('name', 'defined') | map(attribute='name') | list"
     - ip_version == 'ipv4'
     - hostvars[item]['monitor_address_block'] | default('subnet')  == 'subnet'
-    - hostvars[item]['monitor_address'] | default('0.0.0.0') == '0.0.0.0'
+    - hostvars[item]['monitor_address'] | default('x.x.x.x') == 'x.x.x.x'
     - hostvars[item]['monitor_interface'] | default('interface') != 'interface'
 
 - name: set_fact _monitor_address to monitor_interface - ipv6
@@ -47,7 +47,7 @@
     - "item not in _monitor_addresses | default([]) | selectattr('name', 'defined') | map(attribute='name') | list"
     - ip_version == 'ipv6'
     - hostvars[item]['monitor_address_block'] | default('subnet')  == 'subnet'
-    - hostvars[item]['monitor_address'] | default('0.0.0.0') == '0.0.0.0'
+    - hostvars[item]['monitor_address'] | default('x.x.x.x') == 'x.x.x.x'
     - hostvars[item]['monitor_interface'] | default('interface') != 'interface'
 
 - name: set_fact _current_monitor_address

diff --git a/roles/ceph-facts/tasks/set_radosgw_address.yml b/roles/ceph-facts/tasks/set_radosgw_address.yml
index 621ed80099a5db7654741628e0a39322917133c5..3b1de111532f692c0e4ef5e489e51e473992dc82 100644 (file)
--- a/roles/ceph-facts/tasks/set_radosgw_address.yml
+++ b/roles/ceph-facts/tasks/set_radosgw_address.yml
@@ -20,12 +20,12 @@
     _radosgw_address: "{{ radosgw_address | ipwrap }}"
   when:
     - radosgw_address is defined
-    - radosgw_address != '0.0.0.0'
+    - radosgw_address != 'x.x.x.x'
 
 - name: tasks for radosgw interface
   when:
     - radosgw_address_block == 'subnet'
-    - radosgw_address == '0.0.0.0'
+    - radosgw_address == 'x.x.x.x'
     - radosgw_interface != 'interface'
   block:
   - name: set_fact _interface

diff --git a/roles/ceph-validate/tasks/main.yml b/roles/ceph-validate/tasks/main.yml
index 923eed3a027dc20fdd813cdc35bd4aff237cc652..f07971943969d940498984684707760a6097920a 100644 (file)
--- a/roles/ceph-validate/tasks/main.yml
+++ b/roles/ceph-validate/tasks/main.yml
@@ -40,7 +40,7 @@
     msg: "Either monitor_address, monitor_address_block or monitor_interface must be provided"
   when:
     - mon_group_name in group_names
-    - monitor_address == '0.0.0.0'
+    - monitor_address == 'x.x.x.x'
     - monitor_address_block == 'subnet'
     - monitor_interface == 'interface'
 
@@ -49,7 +49,7 @@
     msg: "Either radosgw_address, radosgw_address_block or radosgw_interface must be provided"
   when:
     - rgw_group_name in group_names
-    - radosgw_address == '0.0.0.0'
+    - radosgw_address == 'x.x.x.x'
     - radosgw_address_block == 'subnet'
     - radosgw_interface == 'interface'
 
@@ -149,7 +149,7 @@
   when:
     - mon_group_name in group_names
     - monitor_interface != "dummy"
-    - monitor_address == "0.0.0.0"
+    - monitor_address == "x.x.x.x"
     - monitor_address_block == "subnet"
 
 - name: include check_ipaddr_mon.yml
@@ -157,7 +157,7 @@
   when:
     - mon_group_name in group_names
     - monitor_interface == "interface"
-    - monitor_address == "0.0.0.0"
+    - monitor_address == "x.x.x.x"
     - monitor_address_block != "subnet"
 
 - name: include check_eth_rgw.yml
@@ -165,7 +165,7 @@
   when:
     - rgw_group_name in group_names
     - radosgw_interface != "dummy"
-    - radosgw_address == "0.0.0.0"
+    - radosgw_address == "x.x.x.x"
     - radosgw_address_block == "subnet"
 
 - name: include check_rgw_multisite.yml