openstack/puppet-ceph
Code Issues Proposed changes

Merge "Remove workaround for issue caused by default ldap secret"

Browse Source
This commit is contained in:
Zuul 2021-12-08 01:54:48 +00:00 committed by Gerrit Code Review
commit be32caa76d
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/rgw/keystone.pp
View File

@ -83,13 +83,6 @@ define ceph::rgw::keystone (
"client.${name}/rgw_keystone_implicit_tenants": value => $rgw_keystone_implicit_tenants; "client.${name}/rgw_keystone_implicit_tenants": value => $rgw_keystone_implicit_tenants;
} }
# FIXME(ykarel) Cleanup once https://tracker.ceph.com/issues/24228 is fixed for luminous
if ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
ceph_config {
"client.${name}/rgw_ldap_secret": value => '';
}
}
ceph_config { ceph_config {
"client.${name}/rgw_keystone_api_version": value => 3; "client.${name}/rgw_keystone_api_version": value => 3;
"client.${name}/rgw_keystone_admin_domain": value => $rgw_keystone_admin_domain; "client.${name}/rgw_keystone_admin_domain": value => $rgw_keystone_admin_domain;