ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 e4869ac8bd)
pull/3383/head
Guillaume Abrioux 2018-11-28 20:53:10 +01:00 committed by Sébastien Han
parent 968e6f5854
commit 659f2c60b5
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all.yml.sample
View File

@ -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. # 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. # Preference will go to radosgw_address if both radosgw_address and radosgw_interface are defined.
#radosgw_interface: interface #radosgw_interface: interface
#radosgw_address: address #radosgw_address: 0.0.0.0
#radosgw_address_block: subnet #radosgw_address_block: subnet
#radosgw_keystone_ssl: false # activate this when using keystone PKI keys #radosgw_keystone_ssl: false # activate this when using keystone PKI keys
# Rados Gateway options # Rados Gateway options

2
group_vars/rhcs.yml.sample
View File

@ -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. # 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. # Preference will go to radosgw_address if both radosgw_address and radosgw_interface are defined.
#radosgw_interface: interface #radosgw_interface: interface
#radosgw_address: address #radosgw_address: 0.0.0.0
#radosgw_address_block: subnet #radosgw_address_block: subnet
#radosgw_keystone_ssl: false # activate this when using keystone PKI keys #radosgw_keystone_ssl: false # activate this when using keystone PKI keys
# Rados Gateway options # Rados Gateway options

2
plugins/actions/validate.py
View File

@ -180,7 +180,7 @@ def validate_rados_options(value):
Either radosgw_interface, radosgw_address or radosgw_address_block must Either radosgw_interface, radosgw_address or radosgw_address_block must
be defined. 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_address_block_given = notario_store["radosgw_address_block"] != "subnet"
radosgw_interface_given = notario_store["radosgw_interface"] != "interface" radosgw_interface_given = notario_store["radosgw_interface"] != "interface"

2
roles/ceph-defaults/defaults/main.yml
View File

@ -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. # 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. # Preference will go to radosgw_address if both radosgw_address and radosgw_interface are defined.
radosgw_interface: interface radosgw_interface: interface
radosgw_address: address radosgw_address: 0.0.0.0
radosgw_address_block: subnet radosgw_address_block: subnet
radosgw_keystone_ssl: false # activate this when using keystone PKI keys radosgw_keystone_ssl: false # activate this when using keystone PKI keys
# Rados Gateway options # Rados Gateway options

2
roles/ceph-docker-common/tasks/check_mandatory_vars.yml
View File

@ -14,5 +14,5 @@
when: when:
- rgw_group_name in group_names - rgw_group_name in group_names
- radosgw_interface == 'interface' - radosgw_interface == 'interface'
- radosgw_address == 'address' - radosgw_address == '0.0.0.0'
- radosgw_address_block == 'subnet' - radosgw_address_block == 'subnet'