openstack/puppet-neutron
Code Issues Proposed changes

Remove auth_uri

Browse Source 
Change-Id: I9e0317b462423179dc93004f40d0bd9cba8b14c7
This commit is contained in:
Tobias Urdin
2018-11-29 00:25:16 +01:00
parent 228b2aab49
commit 324640a48d
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/cisco_ml2.pp
View File

@@ -6,8 +6,8 @@ class { '::neutron':
} }
class { '::neutron::server': class { '::neutron::server':
auth_uri => 'http://127.0.0.1:5000', www_authenticate_uri => 'http://127.0.0.1:5000',
auth_password => 'keystone_secret', auth_password => 'keystone_secret',
} }
class { '::neutron::plugins::ml2': class { '::neutron::plugins::ml2':

12
manifests/keystone/authtoken.pp
View File

@@ -169,10 +169,6 @@
# #
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
# [*auth_uri*]
# (Optional) Complete public Identity API endpoint.
# Defaults to undef
#
# [*check_revocations_for_cached*] # [*check_revocations_for_cached*]
# (Optional) If true, the revocation list will be checked for cached tokens. # (Optional) If true, the revocation list will be checked for cached tokens.
# This requires that PKI tokens are configured on the identity server. # This requires that PKI tokens are configured on the identity server.
@@ -225,7 +221,6 @@ class neutron::keystone::authtoken(
$token_cache_time = $::os_service_default, $token_cache_time = $::os_service_default,
$service_token_roles_required = $::os_service_default, $service_token_roles_required = $::os_service_default,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$auth_uri = undef,
$check_revocations_for_cached = undef, $check_revocations_for_cached = undef,
$hash_algorithms = undef, $hash_algorithms = undef,
) { ) {
@@ -236,11 +231,6 @@ class neutron::keystone::authtoken(
fail('Please set password for neutron service user') fail('Please set password for neutron service user')
} }
if $auth_uri {
warning('The auth_uri parameter is deprecated. Please use www_authenticate_uri instead.')
}
$www_authenticate_uri_real = pick($auth_uri, $www_authenticate_uri)
if $check_revocations_for_cached { if $check_revocations_for_cached {
warning('check_revocations_for_cached parameter is deprecated, has no effect and will be removed in the future.') warning('check_revocations_for_cached parameter is deprecated, has no effect and will be removed in the future.')
} }
@@ -254,7 +244,7 @@ class neutron::keystone::authtoken(
password => $password, password => $password,
project_name => $project_name, project_name => $project_name,
auth_url => $auth_url, auth_url => $auth_url,
www_authenticate_uri => $www_authenticate_uri_real, www_authenticate_uri => $www_authenticate_uri,
auth_version => $auth_version, auth_version => $auth_version,
auth_type => $auth_type, auth_type => $auth_type,
auth_section => $auth_section, auth_section => $auth_section,

4
releasenotes/notes/remove-auth-uri-cf6011f3cc813065.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
upgrade:
- |
The deprecated parameter auth_uri is now removed, please use www_authenticate_uri.