Remove deprecated and ineffective neutron options

These were deprecated during 2023.2 cycle[1], and have been unused
since the fallback to admin user credential has been removed.

[1] fd09a0cfc3

Change-Id: Ie8c9d099a45ebd684248662dfb9e17f51a3136d4
This commit is contained in:
Takashi Kajinami 2024-08-22 13:14:35 +09:00
parent 50f686fcff
commit 182241a184
4 changed files with 11 additions and 41 deletions

View File

@ -33,35 +33,6 @@ NETWORK_API_NEUTRON_OPTS = [
cfg.StrOpt('client_certificate_file',
help='Location of client certificate file to use for '
'neutron client requests.'),
cfg.StrOpt('admin_username',
help='username for connecting to neutron in admin context',
deprecated_for_removal=True,
deprecated_reason='This parameter is no longer used.',
deprecated_since='2023.2'),
cfg.StrOpt('admin_password',
help='password for connecting to neutron in admin context',
secret=True, deprecated_for_removal=True,
deprecated_reason='This parameter is no longer used.',
deprecated_since='2023.2'),
cfg.StrOpt('admin_tenant_name',
help='tenant name for connecting to neutron in admin context',
deprecated_for_removal=True,
deprecated_reason='This parameter is no longer used.',
deprecated_since='2023.2'),
cfg.StrOpt('auth_url',
help='auth url for connecting to neutron in admin context',
deprecated_for_removal=True,
deprecated_reason='This parameter is no longer used.',
deprecated_since='2023.2'),
cfg.StrOpt('auth_strategy',
default='keystone',
help='auth strategy for connecting to '
'neutron in admin context',
deprecated_for_removal=True,
deprecated_reason='This parameter is no longer used.',
deprecated_since='2023.2'),
]

View File

@ -359,11 +359,6 @@ GMR Example
verbose = True
network_api:neutron:
admin_password = ***
admin_tenant_name = None
admin_username = None
auth_strategy = keystone
auth_url = None
ca_certificates_file = None
endpoint_type = publicURL
endpoints = None

View File

@ -55,14 +55,7 @@ Configuring the FloatingIP feature is really simple:
endpoints = RegionOne|http://localhost:9696
endpoint_type = publicURL
timeout = 30
# This is optional - if these credentials are not provided designate will
# use the users context and auth token to query neutron
#admin_username = designate
#admin_password = designate
#admin_tenant_name = designate
auth_url = http://localhost:35357/v2.0
insecure = False
auth_strategy = keystone
ca_certificates_file = /etc/path/to/ca.pem
Note that using admin_user, admin_password and admin_tenant_name is optional,

View File

@ -0,0 +1,11 @@
---
upgrade:
- |
The following deprecated options in the ``network_api:neutron`` section
have been removed.
- ``admin_username``
- ``admin_password``
- ``admin_tenant_name``
- ``auth_url``
- ``auth_strategy``