Browse Source

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

changes/96/821196/1
Zuul 6 months ago committed by Gerrit Code Review
parent
commit
be32caa76d
  1. 7
      manifests/rgw/keystone.pp

7
manifests/rgw/keystone.pp

@ -83,13 +83,6 @@ define ceph::rgw::keystone (
"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 {
"client.${name}/rgw_keystone_api_version": value => 3;
"client.${name}/rgw_keystone_admin_domain": value => $rgw_keystone_admin_domain;

Loading…
Cancel
Save