diff --git a/keystone/conf/auth.py b/keystone/conf/auth.py index 9894de4e02..d53fc15e39 100644 --- a/keystone/conf/auth.py +++ b/keystone/conf/auth.py @@ -76,6 +76,16 @@ namespace. You do not need to set this unless you are overriding keystone's own `mapped` authentication plugin. """)) +application_credential = cfg.StrOpt( + 'application_credential', + help=utils.fmt(""" +Entry point for the application_credential auth plugin module in the +`keystone.auth.application_credential` namespace. You do not need to set this +unless you are overriding keystone's own `application_credential` +authentication plugin. +""")) + + GROUP_NAME = __name__.split('.')[-1] ALL_OPTS = [ methods, @@ -84,6 +94,7 @@ ALL_OPTS = [ external, oauth1, mapped, + application_credential, ] diff --git a/keystone/conf/constants.py b/keystone/conf/constants.py index 8304e769a4..893352d593 100644 --- a/keystone/conf/constants.py +++ b/keystone/conf/constants.py @@ -17,7 +17,8 @@ package. """ -_DEFAULT_AUTH_METHODS = ['external', 'password', 'token', 'oauth1', 'mapped'] +_DEFAULT_AUTH_METHODS = ['external', 'password', 'token', 'oauth1', 'mapped', + 'application_credential'] _CERTFILE = '/etc/keystone/ssl/certs/signing_cert.pem' _KEYFILE = '/etc/keystone/ssl/private/signing_key.pem'