RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-10 13:10:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29793 from sebastian-philipp/ansible-default-realm-zonegroup

Browse Source 
mgr/ansible: Change default realm and zonegroup

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
This commit is contained in:
Sebastian Wagner 2019-09-11 14:57:47 +02:00 committed by GitHub
commit 9d0868794d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pybind/mgr/ansible/module.py
View File

@ -722,9 +722,9 @@ class Module(MgrModule, orchestrator.Orchestrator):
spec.rgw_frontend_port = spec.rgw_frontend_port \
if spec.rgw_frontend_port is not None else 8080
spec.rgw_zonegroup = spec.rgw_zonegroup if spec.rgw_zonegroup is not None else "Main"
spec.rgw_zonegroup = spec.rgw_zonegroup if spec.rgw_zonegroup is not None else "default"
spec.rgw_zone_user = spec.rgw_zone_user if spec.rgw_zone_user is not None else "zone.user"
spec.rgw_realm = spec.rgw_realm if spec.rgw_realm is not None else "RGW_Realm"
spec.rgw_realm = spec.rgw_realm if spec.rgw_realm is not None else "default"
spec.system_access_key = spec.system_access_key \
if spec.system_access_key is not None else spec.genkey(20)