From e4869ac8bd574af56952f02b1c8f63ecae0d5d86 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 28 Nov 2018 20:53:10 +0100 Subject: [PATCH] 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 --- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 2 +- plugins/actions/validate.py | 2 +- roles/ceph-defaults/defaults/main.yml | 2 +- roles/ceph-defaults/tasks/set_radosgw_address.yml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 0e4f91c11..66d307711 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -402,7 +402,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 a3135090a..dda71ce94 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -402,7 +402,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 b5d7d863f..c6d4d78ef 100644 --- a/plugins/actions/validate.py +++ b/plugins/actions/validate.py @@ -187,7 +187,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 68967a839..188f6116a 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -394,7 +394,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-defaults/tasks/set_radosgw_address.yml b/roles/ceph-defaults/tasks/set_radosgw_address.yml index 1da7df55c..b0dcd0331 100644 --- a/roles/ceph-defaults/tasks/set_radosgw_address.yml +++ b/roles/ceph-defaults/tasks/set_radosgw_address.yml @@ -11,7 +11,7 @@ _radosgw_address: "{{ radosgw_address | ipwrap }}" when: - radosgw_address is defined - - radosgw_address != 'address' + - radosgw_address != '0.0.0.0' - block: - name: set_fact _interface @@ -31,5 +31,5 @@ - ip_version == 'ipv6' when: - radosgw_address_block == 'subnet' - - radosgw_address == 'address' + - radosgw_address == '0.0.0.0' - radosgw_interface != 'interface' -- 2.39.5