validate: change default value for `radosgw_address`

change default value of `radosgw_address` to keep consistency with
`monitor_address`.
Moreover, `ceph-validate` checks if the value is '0.0.0.0' to determine
if it has to run `check_eth_rgw.yml`.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1600227
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit e4869ac8bd574af56952f02b1c8f63ecae0d5d86)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 80a55c1c077e16e38a57c8e82aac669a01072ab4..18d2e23ccf0172b995fbc8717b5d92c515710905 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -404,7 +404,7 @@ dummy:
 # 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: address
+#radosgw_address: 0.0.0.0
 #radosgw_address_block: subnet
 #radosgw_keystone_ssl: false # activate this when using keystone PKI keys
 # Rados Gateway options

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 6a8a3a5a6d58dfc3ac431718d4fbf94cfadcf2dd..8031d0279b00ff8f539d3416a0bca50bf41f6e71 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -404,7 +404,7 @@ ceph_rhcs_version: 3
 # 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: address
+#radosgw_address: 0.0.0.0
 #radosgw_address_block: subnet
 #radosgw_keystone_ssl: false # activate this when using keystone PKI keys
 # Rados Gateway options

diff --git a/plugins/actions/validate.py b/plugins/actions/validate.py
index 620358eae9e5720b6ac99a0a2f5da52f865c4735..c4ca4ac241d265da0f4b6cf6239e062f335d3ac7 100644 (file)
--- a/plugins/actions/validate.py
+++ b/plugins/actions/validate.py
@@ -180,7 +180,7 @@ def validate_rados_options(value):
     Either radosgw_interface, radosgw_address or radosgw_address_block must
     be defined.
     """
-    radosgw_address_given = notario_store["radosgw_address"] != "address"
+    radosgw_address_given = notario_store["radosgw_address"] != "0.0.0.0"
     radosgw_address_block_given = notario_store["radosgw_address_block"] != "subnet"
     radosgw_interface_given = notario_store["radosgw_interface"] != "interface"
 

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index e6e535f34d5bee67a0ef401de28f0e2bd327a3dc..807b3bc4af27f67a1eda80042b1415a9cdbdb0e8 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -396,7 +396,7 @@ radosgw_frontend_options: "{{ radosgw_civetweb_options if radosgw_frontend_type
 # 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: address
+radosgw_address: 0.0.0.0
 radosgw_address_block: subnet
 radosgw_keystone_ssl: false # activate this when using keystone PKI keys
 # Rados Gateway options

diff --git a/roles/ceph-docker-common/tasks/check_mandatory_vars.yml b/roles/ceph-docker-common/tasks/check_mandatory_vars.yml
index 011433b20515c29dda2a06ec5a5044680230dd83..0114157bd1b075ac331eff47803d66548b83399c 100644 (file)
--- a/roles/ceph-docker-common/tasks/check_mandatory_vars.yml
+++ b/roles/ceph-docker-common/tasks/check_mandatory_vars.yml
@@ -14,5 +14,5 @@
   when:
     - rgw_group_name in group_names
     - radosgw_interface == 'interface'
-    - radosgw_address == 'address'
+    - radosgw_address == '0.0.0.0'
     - radosgw_address_block == 'subnet'