openstack
/
puppet-glance
Code Issues Proposed changes

Merge "Remove auth_uri"

This commit is contained in:
Zuul 2018-12-05 21:57:44 +00:00 committed by Gerrit Code Review
parent 402c369d28 779162c884
commit f9599167b2
4 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/api.pp
View File

@ -566,12 +566,11 @@ class glance::api(
$keystone_project_name = $::glance::api::authtoken::project_name $keystone_project_name = $::glance::api::authtoken::project_name
$keystone_username = $::glance::api::authtoken::username $keystone_username = $::glance::api::authtoken::username
$keystone_password = $::glance::api::authtoken::password $keystone_password = $::glance::api::authtoken::password
# TODO(tobasco): Remove pick when auth_uri is removed. $auth_url = $::glance::api::authtoken::www_authenticate_uri
$auth_uri = pick($::glance::api::authtoken::auth_uri, $::glance::api::authtoken::www_authenticate_uri)
$defaults = { $defaults = {
'glance-api' => { 'glance-api' => {
# lint:ignore:140chars # lint:ignore:140chars
'command' => "glance --os-auth-url ${auth_uri} --os-project-name ${keystone_project_name} --os-username ${keystone_username} --os-password ${keystone_password} image-list", 'command' => "glance --os-auth-url ${auth_url} --os-project-name ${keystone_project_name} --os-username ${keystone_username} --os-password ${keystone_password} image-list",
# lint:endignore # lint:endignore
} }
} }

15
manifests/api/authtoken.pp
View File

@ -178,12 +178,6 @@
# (in seconds). Set to -1 to disable caching completely. Integer value # (in seconds). Set to -1 to disable caching completely. Integer value
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
# DEPRECATED PARAMETERS
#
# [*auth_uri*]
# (Optional) Complete public Identity API endpoint.
# Defaults to undef
#
class glance::api::authtoken( class glance::api::authtoken(
$username = 'glance', $username = 'glance',
$password = $::os_service_default, $password = $::os_service_default,
@ -219,8 +213,6 @@ class glance::api::authtoken(
$manage_memcache_package = false, $manage_memcache_package = false,
$region_name = $::os_service_default, $region_name = $::os_service_default,
$token_cache_time = $::os_service_default, $token_cache_time = $::os_service_default,
# DEPRECATED PARAMETERS
$auth_uri = undef,
) { ) {
include ::glance::deps include ::glance::deps
@ -229,17 +221,12 @@ class glance::api::authtoken(
fail('Please set password for Glance service user') fail('Please set password for Glance 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)
keystone::resource::authtoken { 'glance_api_config': keystone::resource::authtoken { 'glance_api_config':
username => $username, username => $username,
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,

15
manifests/registry/authtoken.pp
View File

@ -178,12 +178,6 @@
# (in seconds). Set to -1 to disable caching completely. Integer value # (in seconds). Set to -1 to disable caching completely. Integer value
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
# DEPRECATED PARAMETERS
#
# [*auth_uri*]
# (Optional) Complete public Identity API endpoint.
# Defaults to undef
#
class glance::registry::authtoken( class glance::registry::authtoken(
$username = 'glance', $username = 'glance',
$password = $::os_service_default, $password = $::os_service_default,
@ -219,8 +213,6 @@ class glance::registry::authtoken(
$manage_memcache_package = false, $manage_memcache_package = false,
$region_name = $::os_service_default, $region_name = $::os_service_default,
$token_cache_time = $::os_service_default, $token_cache_time = $::os_service_default,
# DEPRECATED PARAMETERS
$auth_uri = undef,
) { ) {
include ::glance::deps include ::glance::deps
@ -229,17 +221,12 @@ class glance::registry::authtoken(
fail('Please set password for Glance service user') fail('Please set password for Glance 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)
keystone::resource::authtoken { 'glance_registry_config': keystone::resource::authtoken { 'glance_registry_config':
username => $username, username => $username,
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-d5ec1ba55c15ff74.yaml Normal file
View File

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