Merge "Do not check for ldap secret with Fedora and RedHat > 7"
This commit is contained in:
commit
39624dc0b5
|
@ -106,6 +106,14 @@ 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['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_version == 'v2.0' {
|
||||||
if $rgw_keystone_admin_token == undef
|
if $rgw_keystone_admin_token == undef
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue