Remove swift::proxy::keystoneauth::admin_token

The parameter has been deprecated for a long time and
has no use.

Change-Id: Iddb64f50696aad21c65ccb1cf4be483afea5202e
This commit is contained in:
Tobias Urdin 2019-01-14 17:18:26 +01:00
parent 2d818c66f6
commit 1428c5074c
3 changed files with 5 additions and 11 deletions

View File

@ -60,7 +60,6 @@ $swift_zone = hiera('swift_zone', 1)
# configurations that need to be applied to all swift nodes
$swift_keystone_db_password = hiera('keystone_db_password', 'keystone_db_password')
$keystone_admin_token = hiera('admin_token', 'service_token')
$swift_keystone_admin_email = hiera('admin_email', 'keystone@localhost')
$swift_keystone_admin_password = hiera('admin_password', 'ChangeMe')
@ -91,7 +90,7 @@ node 'swift-keystone' {
class { '::keystone':
debug => $debug,
catalog_type => 'sql',
admin_token => $admin_token,
admin_password => $swift_keystone_admin_password,
enabled => $enabled,
sql_connection => "mysql://keystone_admin:${swift_keystone_db_password}@127.0.0.1/keystone",
}

View File

@ -57,10 +57,6 @@
#
# == DEPRECATED
#
# [*admin_token*]
# (optional) Deprecated.
# Defaults to undef
#
# [*identity_uri*]
# (optional) Deprecated. Use auth_url instead.
# Defaults to undef
@ -107,16 +103,11 @@ class swift::proxy::authtoken(
$admin_tenant_name = undef,
$admin_password = undef,
$identity_uri = undef,
$admin_token = undef,
$auth_uri = undef,
) inherits swift::params {
include ::swift::deps
if $admin_token {
warning('admin_token is deprecated, has no usage and will be removed in the O release')
}
if $identity_uri {
warning('identity_uri is deprecated and will be removed, please use auth_url instead')
}

View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The deprecated parameter admin_token in swift::proxy::authtoken is now removed.