From d5409109fbec7a318fae09ad469f10ac0aae3866 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 30 Oct 2018 15:01:46 +0100 Subject: [PATCH] rgw: move multisite default variables in ceph-defaults Move all rgw multisite variables in ceph-defaults so ceph-validate can go through them. Signed-off-by: Guillaume Abrioux --- group_vars/all.yml.sample | 27 +++++++++++++++++++++++++++ group_vars/rgws.yml.sample | 25 ------------------------- group_vars/rhcs.yml.sample | 27 +++++++++++++++++++++++++++ roles/ceph-defaults/defaults/main.yml | 27 +++++++++++++++++++++++++++ roles/ceph-rgw/defaults/main.yml | 25 ------------------------- roles/ceph-validate/tasks/main.yml | 2 +- 6 files changed, 82 insertions(+), 51 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 7b1572ae3..c04c6490d 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -473,6 +473,33 @@ dummy: # Set this to true to enable Object access via NFS. Requires an RGW role. #nfs_obj_gw: true + +############# +# MULTISITE # +############# + +#rgw_multisite: false + +# The following Multi-site related variables should be set by the user. +# rgw_zone is set to "default" to enable compression for clusters configured without rgw multi-site +# If multisite is configured rgw_zone should not be set to "default". See README-MULTISITE.md for an example. +#rgw_zone: default + +#rgw_zonemaster: true +#rgw_zonesecondary: false +#rgw_multisite_endpoint_addr: "{{ ansible_fqdn }}" +#rgw_zonegroup: solarsystem # should be set by the user +#rgw_zone_user: zone.user +#rgw_realm: milkyway # should be set by the user +#system_access_key: 6kWkikvapSnHyE22P7nO # should be re-created by the user +#system_secret_key: MGecsMrWtKZgngOHZdrd6d3JxGO5CPWgT2lcnpSt # should be re-created by the user + +# Multi-site remote pull URL variables +#rgw_pull_port: "{{ radosgw_civetweb_port }}" +#rgw_pull_proto: "http" +#rgw_pullhost: localhost # rgw_pullhost only needs to be declared if there is a zone secondary. It should be the same as rgw_multisite_endpoint_addr for the master cluster + + ################### # CONFIG OVERRIDE # ################### diff --git a/group_vars/rgws.yml.sample b/group_vars/rgws.yml.sample index 3ab282bb9..78e69513f 100644 --- a/group_vars/rgws.yml.sample +++ b/group_vars/rgws.yml.sample @@ -49,31 +49,6 @@ dummy: # size: "" -############# -# MULTISITE # -############# - -#rgw_multisite: false - -# The following Multi-site related variables should be set by the user. -# rgw_zone is set to "default" to enable compression for clusters configured without rgw multi-site -# If multisite is configured rgw_zone should not be set to "default". See README-MULTISITE.md for an example. -#rgw_zone: default - -#rgw_zonemaster: true -#rgw_zonesecondary: false -#rgw_multisite_endpoint_addr: "{{ ansible_fqdn }}" -#rgw_zonegroup: solarsystem # should be set by the user -#rgw_zone_user: zone.user -#rgw_realm: milkyway # should be set by the user -#system_access_key: 6kWkikvapSnHyE22P7nO # should be re-created by the user -#system_secret_key: MGecsMrWtKZgngOHZdrd6d3JxGO5CPWgT2lcnpSt # should be re-created by the user - -# Multi-site remote pull URL variables -#rgw_pull_port: "{{ radosgw_civetweb_port }}" -#rgw_pull_proto: "http" -#rgw_pullhost: localhost # rgw_pullhost only needs to be declared if there is a zone secondary. It should be the same as rgw_multisite_endpoint_addr for the master cluster - ########## # DOCKER # ########## diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 7f81594ef..812e38d5b 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -473,6 +473,33 @@ ceph_rhcs_version: 3 # Set this to true to enable Object access via NFS. Requires an RGW role. #nfs_obj_gw: true + +############# +# MULTISITE # +############# + +#rgw_multisite: false + +# The following Multi-site related variables should be set by the user. +# rgw_zone is set to "default" to enable compression for clusters configured without rgw multi-site +# If multisite is configured rgw_zone should not be set to "default". See README-MULTISITE.md for an example. +#rgw_zone: default + +#rgw_zonemaster: true +#rgw_zonesecondary: false +#rgw_multisite_endpoint_addr: "{{ ansible_fqdn }}" +#rgw_zonegroup: solarsystem # should be set by the user +#rgw_zone_user: zone.user +#rgw_realm: milkyway # should be set by the user +#system_access_key: 6kWkikvapSnHyE22P7nO # should be re-created by the user +#system_secret_key: MGecsMrWtKZgngOHZdrd6d3JxGO5CPWgT2lcnpSt # should be re-created by the user + +# Multi-site remote pull URL variables +#rgw_pull_port: "{{ radosgw_civetweb_port }}" +#rgw_pull_proto: "http" +#rgw_pullhost: localhost # rgw_pullhost only needs to be declared if there is a zone secondary. It should be the same as rgw_multisite_endpoint_addr for the master cluster + + ################### # CONFIG OVERRIDE # ################### diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 2e20d61fb..9c167a927 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -465,6 +465,33 @@ nfs_file_gw: false # Set this to true to enable Object access via NFS. Requires an RGW role. nfs_obj_gw: true + +############# +# MULTISITE # +############# + +rgw_multisite: false + +# The following Multi-site related variables should be set by the user. +# rgw_zone is set to "default" to enable compression for clusters configured without rgw multi-site +# If multisite is configured rgw_zone should not be set to "default". See README-MULTISITE.md for an example. +rgw_zone: default + +rgw_zonemaster: true +rgw_zonesecondary: false +rgw_multisite_endpoint_addr: "{{ ansible_fqdn }}" +#rgw_zonegroup: solarsystem # should be set by the user +#rgw_zone_user: zone.user +#rgw_realm: milkyway # should be set by the user +#system_access_key: 6kWkikvapSnHyE22P7nO # should be re-created by the user +#system_secret_key: MGecsMrWtKZgngOHZdrd6d3JxGO5CPWgT2lcnpSt # should be re-created by the user + +# Multi-site remote pull URL variables +rgw_pull_port: "{{ radosgw_civetweb_port }}" +rgw_pull_proto: "http" +#rgw_pullhost: localhost # rgw_pullhost only needs to be declared if there is a zone secondary. It should be the same as rgw_multisite_endpoint_addr for the master cluster + + ################### # CONFIG OVERRIDE # ################### diff --git a/roles/ceph-rgw/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml index f3f099b8d..6ab3946a5 100644 --- a/roles/ceph-rgw/defaults/main.yml +++ b/roles/ceph-rgw/defaults/main.yml @@ -41,31 +41,6 @@ copy_admin_key: false # size: "" -############# -# MULTISITE # -############# - -rgw_multisite: false - -# The following Multi-site related variables should be set by the user. -# rgw_zone is set to "default" to enable compression for clusters configured without rgw multi-site -# If multisite is configured rgw_zone should not be set to "default". See README-MULTISITE.md for an example. -rgw_zone: default - -rgw_zonemaster: true -rgw_zonesecondary: false -rgw_multisite_endpoint_addr: "{{ ansible_fqdn }}" -#rgw_zonegroup: solarsystem # should be set by the user -#rgw_zone_user: zone.user -#rgw_realm: milkyway # should be set by the user -#system_access_key: 6kWkikvapSnHyE22P7nO # should be re-created by the user -#system_secret_key: MGecsMrWtKZgngOHZdrd6d3JxGO5CPWgT2lcnpSt # should be re-created by the user - -# Multi-site remote pull URL variables -rgw_pull_port: "{{ radosgw_civetweb_port }}" -rgw_pull_proto: "http" -#rgw_pullhost: localhost # rgw_pullhost only needs to be declared if there is a zone secondary. It should be the same as rgw_multisite_endpoint_addr for the master cluster - ########## # DOCKER # ########## diff --git a/roles/ceph-validate/tasks/main.yml b/roles/ceph-validate/tasks/main.yml index 1847870ed..6efab8170 100644 --- a/roles/ceph-validate/tasks/main.yml +++ b/roles/ceph-validate/tasks/main.yml @@ -71,7 +71,7 @@ - name: include check_rgw_multisite.yml include_tasks: check_rgw_multisite.yml - when: + when: - inventory_hostname in groups.get(rgw_group_name, []) - rgw_multisite