Remove old authtoken options
Since we are in ocata lets remove all old parameters in api to configure the keystone_authtoken section Change-Id: I4d44e7a6e1623acfd73345e0877a9fcd8f128ca8
This commit is contained in:
parent
8ee979a474
commit
bc47dbcea8
|
@ -202,20 +202,6 @@
|
|||
#
|
||||
# === DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*keystone_password*]
|
||||
# (optional) DEPRECATED. Use barbican::keystone::authtoken::password
|
||||
# instead.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*auth_url*]
|
||||
# (optional) DEPRECATED. Use barbican::keystone::authtoken::auth_url
|
||||
# instead.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*auth_type*]
|
||||
# (optional) DEPRECATED. Use auth_strategy instead.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*rabbit_host*]
|
||||
# (optional) Location of rabbitmq installation.
|
||||
# Defaults to $::os_service_default
|
||||
|
@ -284,9 +270,6 @@ class barbican::api (
|
|||
$service_name = 'barbican-api',
|
||||
$enable_proxy_headers_parsing = $::os_service_default,
|
||||
# DEPRECATED
|
||||
$auth_type = undef,
|
||||
$keystone_password = undef,
|
||||
$auth_url = undef,
|
||||
$rabbit_host = $::os_service_default,
|
||||
$rabbit_hosts = $::os_service_default,
|
||||
$rabbit_password = $::os_service_default,
|
||||
|
@ -300,21 +283,6 @@ class barbican::api (
|
|||
include ::barbican::api::logging
|
||||
include ::barbican::client
|
||||
|
||||
if $auth_type {
|
||||
warning('auth_type is deprecated and will be removed, use auth_strategy instead')
|
||||
$auth_strategy_real = $auth_type
|
||||
} else {
|
||||
$auth_strategy_real = $auth_strategy
|
||||
}
|
||||
|
||||
if $keystone_password {
|
||||
warning('keystone_password is deprecated, use barbican::keystone::authtoken::password instead.')
|
||||
}
|
||||
|
||||
if $auth_url {
|
||||
warning('auth_url is deprecated, use barbican::keystone::authtoken::auth_url instead.')
|
||||
}
|
||||
|
||||
if !is_service_default($rabbit_host) or
|
||||
!is_service_default($rabbit_hosts) or
|
||||
!is_service_default($rabbit_password) or
|
||||
|
@ -418,7 +386,7 @@ deprecated. Please use barbican::default_transport_url instead.")
|
|||
}
|
||||
|
||||
# keystone config
|
||||
if $auth_strategy_real == 'keystone' {
|
||||
if $auth_strategy == 'keystone' {
|
||||
|
||||
include ::barbican::keystone::authtoken
|
||||
|
||||
|
|
|
@ -223,18 +223,15 @@ class barbican::keystone::authtoken(
|
|||
$token_cache_time = $::os_service_default,
|
||||
) {
|
||||
|
||||
if is_service_default($password) and ! $::barbican::api::keystone_password {
|
||||
if is_service_default($password) {
|
||||
fail('Please set password for barbican service user')
|
||||
}
|
||||
|
||||
$password_real = pick($::barbican::api::keystone_password, $password)
|
||||
$auth_url_real = pick($::barbican::api::auth_url, $auth_url)
|
||||
|
||||
keystone::resource::authtoken { 'barbican_config':
|
||||
username => $username,
|
||||
password => $password_real,
|
||||
password => $password,
|
||||
project_name => $project_name,
|
||||
auth_url => $auth_url_real,
|
||||
auth_url => $auth_url,
|
||||
auth_uri => $auth_uri,
|
||||
auth_version => $auth_version,
|
||||
auth_type => $auth_type,
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
other:
|
||||
- removed deprecated barbican::api::keystone_password
|
||||
- removed deprecated barbican::api::auth_url
|
||||
- removed deprecated barbican::api::auth_type
|
Loading…
Reference in New Issue