From 9c460e28ac11ba12f417a8e517a37f4aa9a0a67f Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Tue, 28 Jun 2016 15:41:55 +0800 Subject: [PATCH] Config: no need to set default=None By default oslo.cfg sets the default value as None. There is no need to explicitly do this. TrivialFix Change-Id: I8ba1e1d96a40f5563fba7e22af9bf02b9a7b13fa --- keystone/conf/base.py | 1 - keystone/conf/security_compliance.py | 1 - 2 files changed, 2 deletions(-) diff --git a/keystone/conf/base.py b/keystone/conf/base.py index 1b9a886310..44bb051be5 100644 --- a/keystone/conf/base.py +++ b/keystone/conf/base.py @@ -24,7 +24,6 @@ release and will be removed in the O release. admin_token = cfg.StrOpt( 'admin_token', secret=True, - default=None, help=utils.fmt(""" A "shared secret" that can be used to bootstrap Keystone. This "token" does not represent a user, and carries no explicit authorization. If set to `None`, the diff --git a/keystone/conf/security_compliance.py b/keystone/conf/security_compliance.py index 7eac8eebcd..344989fe79 100644 --- a/keystone/conf/security_compliance.py +++ b/keystone/conf/security_compliance.py @@ -66,7 +66,6 @@ value to 0 disables this feature. password_regex = cfg.StrOpt( 'password_regex', - default=None, help=utils.fmt(""" Regular expression used to validate password strength requirements. Setting the value to None disables this feature. The following is an example of a pattern