|
@@ -159,7 +159,7 @@ class LDAPPasswordIdentityProvider(IdentityProviderBase):
|
|
|
self._idp['attributes']['preferredUsername'] = pref_user
|
|
|
|
|
|
if not self._idp['insecure']:
|
|
|
- self._idp['ca'] = '/etc/origin/master/{}_ldap_ca.crt'.format(idp['name'])
|
|
|
+ self._idp['ca'] = '/etc/origin/master/{}_ldap_ca.crt'.format(self.name)
|
|
|
|
|
|
def validate(self):
|
|
|
''' validate this idp instance '''
|
|
@@ -222,7 +222,7 @@ class RequestHeaderIdentityProvider(IdentityProviderBase):
|
|
|
['nameHeaders', 'name_headers'],
|
|
|
['preferredUsernameHeaders', 'preferred_username_headers']]
|
|
|
self._idp['clientCA'] = \
|
|
|
- '/etc/origin/master/{}_request_header_ca.crt'.format(idp['name'])
|
|
|
+ '/etc/origin/master/{}_request_header_ca.crt'.format(self.name)
|
|
|
|
|
|
def validate(self):
|
|
|
''' validate this idp instance '''
|
|
@@ -363,7 +363,7 @@ class OpenIDIdentityProvider(IdentityProviderOauthBase):
|
|
|
if 'extra_authorize_parameters' in self._idp:
|
|
|
self._idp['extraAuthorizeParameters'] = self._idp.pop('extra_authorize_parameters')
|
|
|
|
|
|
- self._idp['ca'] = '/etc/origin/master/{}_openid_ca.crt'.format(idp['name'])
|
|
|
+ self._idp['ca'] = '/etc/origin/master/{}_openid_ca.crt'.format(self.name)
|
|
|
|
|
|
def validate(self):
|
|
|
''' validate this idp instance '''
|