summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-14 13:15:04 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-14 13:15:04 -0400
commitee3f0205333840e18c4796e53b0f061fec666333 (patch)
treebabf4c481dab71a8a441888e0030f1dc8fa93a52
parent40d95679b7b789e404d39c5642753a1ad2307adf (diff)
parenta4ad924fa3c776d8d900c98f6c641ec28d3a9811 (diff)
downloadopenshift-ee3f0205333840e18c4796e53b0f061fec666333.tar.gz
openshift-ee3f0205333840e18c4796e53b0f061fec666333.tar.bz2
openshift-ee3f0205333840e18c4796e53b0f061fec666333.tar.xz
openshift-ee3f0205333840e18c4796e53b0f061fec666333.zip
Merge pull request #1753 from abutcher/mapping-method
Fix mappingMethod option in identity provider.
-rw-r--r--filter_plugins/openshift_master.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/filter_plugins/openshift_master.py b/filter_plugins/openshift_master.py
index d0fb98ec3..34d9aef75 100644
--- a/filter_plugins/openshift_master.py
+++ b/filter_plugins/openshift_master.py
@@ -57,7 +57,7 @@ class IdentityProviderBase(object):
mapping_method = None
for key in mm_keys:
if key in self._idp:
- mapping_method = self._idp[key]
+ mapping_method = self._idp.pop(key)
if mapping_method is None:
mapping_method = self.get_default('mappingMethod')
self.mapping_method = mapping_method