From 5402cc3f8958ad39e823542a9c593d3b859c5771 Mon Sep 17 00:00:00 2001 From: zhufl Date: Tue, 28 May 2019 09:49:15 +0800 Subject: [PATCH] Remove some deprecated identity options Below options are deprecated on 2015, so it's safe to delete them now. * identity.admin_username * auth.admin_tenant_name * identity.admin_tenant_name * identity.admin_password * identity.admin_domain_name Change-Id: I9cfd3b93f032e6816661e16cbb319af507835997 --- ...recated-identity-options-0ffxd1b8db928e43.yaml | 11 +++++++++++ tempest/config.py | 15 ++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 releasenotes/notes/remove-some-deprecated-identity-options-0ffxd1b8db928e43.yaml diff --git a/releasenotes/notes/remove-some-deprecated-identity-options-0ffxd1b8db928e43.yaml b/releasenotes/notes/remove-some-deprecated-identity-options-0ffxd1b8db928e43.yaml new file mode 100644 index 0000000000..e9e9444d18 --- /dev/null +++ b/releasenotes/notes/remove-some-deprecated-identity-options-0ffxd1b8db928e43.yaml @@ -0,0 +1,11 @@ +upgrade: + - | + Remove deprecated config option ``admin_username`` from + ``identity`` groups. Use ``admin_username`` from ``auth`` instead. + Remove deprecated config option ``admin_tenant_name`` from + ``auth`` and ``identity`` groups. Use ``admin_project_name`` from + ``auth`` instead. + Remove deprecated config option ``admin_password`` from + ``identity`` groups. Use ``admin_password`` from ``auth`` instead. + Remove deprecated config option ``admin_domain_name`` from + ``identity`` groups. Use ``admin_domain_name`` from ``auth`` instead. \ No newline at end of file diff --git a/tempest/config.py b/tempest/config.py index f692a4b4d4..8f8979cd68 100644 --- a/tempest/config.py +++ b/tempest/config.py @@ -84,27 +84,20 @@ AuthGroup = [ cfg.StrOpt('admin_username', help="Username for an administrative user. This is needed for " "authenticating requests made by project isolation to " - "create users and projects", - deprecated_group='identity'), + "create users and projects"), cfg.StrOpt('admin_project_name', help="Project name to use for an administrative user. This is " "needed for authenticating requests made by project " - "isolation to create users and projects", - deprecated_opts=[cfg.DeprecatedOpt('admin_tenant_name', - group='auth'), - cfg.DeprecatedOpt('admin_tenant_name', - group='identity')]), + "isolation to create users and projects"), cfg.StrOpt('admin_password', help="Password to use for an administrative user. This is " "needed for authenticating requests made by project " "isolation to create users and projects", - secret=True, - deprecated_group='identity'), + secret=True), cfg.StrOpt('admin_domain_name', default='Default', help="Admin domain name for authentication (Keystone V3). " - "The same domain applies to user and project", - deprecated_group='identity'), + "The same domain applies to user and project"), ] identity_group = cfg.OptGroup(name='identity',