openstack
/
puppet-ceph
Code Issues Proposed changes

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

Ceph rgw fails when running with Fedora as it checks
for not existing file: /etc/openldap/secret which is
only required when enabling ldap [1].

This patch explicitly set rgw_ldap_secret to null to
skip ldap_secret check. This can be cleared up once
issue[1] is fixed in ceph luminous.

[1] https://tracker.ceph.com/issues/24228

Change-Id: Icb5d5b5f3c5348fda00035189591f006bf2fac5d
This commit is contained in:
yatin 2018-12-26 16:20:21 +05:30
parent 698def7bfd
commit 764bcf93de
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
{