Prechádzať zdrojové kódy

Merge pull request #9889 from crmarques/patch-1

Fix idp configuration when using a insecure LTPA provisioner
OpenShift Merge Robot 6 rokov pred
rodič
commit
1a5b16d61f

+ 2 - 1
roles/lib_utils/filter_plugins/openshift_master.py

@@ -158,7 +158,8 @@ class LDAPPasswordIdentityProvider(IdentityProviderBase):
             pref_user = self._idp['attributes'].pop('preferred_username')
             self._idp['attributes']['preferredUsername'] = pref_user
 
-        self._idp['ca'] = '/etc/origin/master/{}_ldap_ca.crt'.format(idp['name'])
+        if not self._idp['insecure']:
+            self._idp['ca'] = '/etc/origin/master/{}_ldap_ca.crt'.format(idp['name'])
 
     def validate(self):
         ''' validate this idp instance '''