summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-12-02 10:00:31 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-12-02 10:00:31 -0500
commiteb7ddb27be3975d8dbd15d29b2c33b18a050c011 (patch)
tree0693c50b7c2c1b3a54739dac7775a35ae15709bd
parent38ded2481033b1dc8b0f439812c7fd79b4c0d6c9 (diff)
parente5c71c781216bb8555482eb5bd1c917b42eeac25 (diff)
downloadopenshift-eb7ddb27be3975d8dbd15d29b2c33b18a050c011.tar.gz
openshift-eb7ddb27be3975d8dbd15d29b2c33b18a050c011.tar.bz2
openshift-eb7ddb27be3975d8dbd15d29b2c33b18a050c011.tar.xz
openshift-eb7ddb27be3975d8dbd15d29b2c33b18a050c011.zip
Merge pull request #1004 from puzzle/fixBasicAuthPasswordIDPValidation
Fix validation for BasicAuthPasswordIdentityProvider
-rw-r--r--filter_plugins/openshift_master.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/filter_plugins/openshift_master.py b/filter_plugins/openshift_master.py
index 76fe610a0..f12017967 100644
--- a/filter_plugins/openshift_master.py
+++ b/filter_plugins/openshift_master.py
@@ -290,8 +290,8 @@ class BasicAuthPasswordIdentityProvider(IdentityProviderBase):
def __init__(self, api_version, idp):
IdentityProviderBase.__init__(self, api_version, idp)
self._allow_additional = False
- self._required += [['ca'], ['certFile', 'cert_file'], ['keyFile', 'key_file']]
- self._optional += [['key']]
+ self._required += [['url']]
+ self._optional += [['ca'], ['certFile', 'cert_file'], ['keyFile', 'key_file']]
class IdentityProviderOauthBase(IdentityProviderBase):