openstack
/
puppet-ceph
Code Issues Proposed changes

Merge "Do not check for ldap secret with Fedora and RedHat > 7"

This commit is contained in:
Zuul 2019-01-08 09:30:47 +00:00 committed by Gerrit Code Review
parent c056c28c6a 764bcf93de
commit 39624dc0b5
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/rgw/keystone.pp
View File

@ -106,6 +106,14 @@ 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['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
ceph_config {
"client.${name}/rgw_ldap_secret": value => '';
}
}
if $rgw_keystone_version == 'v2.0' {
if $rgw_keystone_admin_token == undef
{