Merge "Remove deprecated keystone::auth options"
This commit is contained in:
commit
7651c49cac
|
@ -51,46 +51,6 @@
|
||||||
# (optional) The endpoint's internal url. (Defaults to 'http://127.0.0.1:9292')
|
# (optional) The endpoint's internal url. (Defaults to 'http://127.0.0.1:9292')
|
||||||
# This url should *not* contain any trailing '/'.
|
# This url should *not* contain any trailing '/'.
|
||||||
#
|
#
|
||||||
# [*port*]
|
|
||||||
# (optional) DEPRECATED: Use public_url, internal_url and admin_url instead.
|
|
||||||
# Default port for endpoints. (Defaults to 9292)
|
|
||||||
# Setting this parameter overrides public_url, internal_url and admin_url parameters.
|
|
||||||
#
|
|
||||||
# [*public_protocol*]
|
|
||||||
# (optional) DEPRECATED: Use public_url instead.
|
|
||||||
# Protocol for public endpoint. (Defaults to 'http')
|
|
||||||
# Setting this parameter overrides public_url parameter.
|
|
||||||
#
|
|
||||||
# [*public_address*]
|
|
||||||
# (optional) DEPRECATED: Use public_url instead.
|
|
||||||
# Public address for endpoint. (Defaults to '127.0.0.1')
|
|
||||||
# Setting this parameter overrides public_url parameter.
|
|
||||||
#
|
|
||||||
# [*internal_protocol*]
|
|
||||||
# (optional) DEPRECATED: Use internal_url instead.
|
|
||||||
# Protocol for internal endpoint. (Defaults to 'http')
|
|
||||||
# Setting this parameter overrides internal_url parameter.
|
|
||||||
#
|
|
||||||
# [*internal_address*]
|
|
||||||
# (optional) DEPRECATED: Use internal_url instead.
|
|
||||||
# Internal address for endpoint. (Defaults to '127.0.0.1')
|
|
||||||
# Setting this parameter overrides internal_url parameter.
|
|
||||||
#
|
|
||||||
# [*admin_protocol*]
|
|
||||||
# (optional) DEPRECATED: Use admin_url instead.
|
|
||||||
# Protocol for admin endpoint. (Defaults to 'http')
|
|
||||||
# Setting this parameter overrides admin_url parameter.
|
|
||||||
#
|
|
||||||
# [*admin_address*]
|
|
||||||
# (optional) DEPRECATED: Use admin_url instead.
|
|
||||||
# Admin address for endpoint. (Defaults to '127.0.0.1')
|
|
||||||
# Setting this parameter overrides admin_url parameter.
|
|
||||||
#
|
|
||||||
# === Deprecation notes
|
|
||||||
#
|
|
||||||
# If any value is provided for public_protocol, public_address or port parameters,
|
|
||||||
# public_url will be completely ignored. The same applies for internal and admin parameters.
|
|
||||||
#
|
|
||||||
# === Examples
|
# === Examples
|
||||||
#
|
#
|
||||||
# class { 'glance::keystone::auth':
|
# class { 'glance::keystone::auth':
|
||||||
|
@ -114,71 +74,8 @@ class glance::keystone::auth(
|
||||||
$public_url = 'http://127.0.0.1:9292',
|
$public_url = 'http://127.0.0.1:9292',
|
||||||
$admin_url = 'http://127.0.0.1:9292',
|
$admin_url = 'http://127.0.0.1:9292',
|
||||||
$internal_url = 'http://127.0.0.1:9292',
|
$internal_url = 'http://127.0.0.1:9292',
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$port = undef,
|
|
||||||
$public_protocol = undef,
|
|
||||||
$public_address = undef,
|
|
||||||
$internal_protocol = undef,
|
|
||||||
$internal_address = undef,
|
|
||||||
$admin_protocol = undef,
|
|
||||||
$admin_address = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
if $port {
|
|
||||||
warning('The port parameter is deprecated, use public_url, internal_url and admin_url instead.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if $public_protocol {
|
|
||||||
warning('The public_protocol parameter is deprecated, use public_url instead.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if $internal_protocol {
|
|
||||||
warning('The internal_protocol parameter is deprecated, use internal_url instead.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if $admin_protocol {
|
|
||||||
warning('The admin_protocol parameter is deprecated, use admin_url instead.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if $public_address {
|
|
||||||
warning('The public_address parameter is deprecated, use public_url instead.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if $internal_address {
|
|
||||||
warning('The internal_address parameter is deprecated, use internal_url instead.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if $admin_address {
|
|
||||||
warning('The admin_address parameter is deprecated, use admin_url instead.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($public_protocol or $public_address or $port) {
|
|
||||||
$public_url_real = sprintf('%s://%s:%s',
|
|
||||||
pick($public_protocol, 'http'),
|
|
||||||
pick($public_address, '127.0.0.1'),
|
|
||||||
pick($port, '9292'))
|
|
||||||
} else {
|
|
||||||
$public_url_real = $public_url
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($admin_protocol or $admin_address or $port) {
|
|
||||||
$admin_url_real = sprintf('%s://%s:%s',
|
|
||||||
pick($admin_protocol, 'http'),
|
|
||||||
pick($admin_address, '127.0.0.1'),
|
|
||||||
pick($port, '9292'))
|
|
||||||
} else {
|
|
||||||
$admin_url_real = $admin_url
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($internal_protocol or $internal_address or $port) {
|
|
||||||
$internal_url_real = sprintf('%s://%s:%s',
|
|
||||||
pick($internal_protocol, 'http'),
|
|
||||||
pick($internal_address, '127.0.0.1'),
|
|
||||||
pick($port, '9292'))
|
|
||||||
} else {
|
|
||||||
$internal_url_real = $internal_url
|
|
||||||
}
|
|
||||||
|
|
||||||
$real_service_name = pick($service_name, $auth_name)
|
$real_service_name = pick($service_name, $auth_name)
|
||||||
|
|
||||||
if $configure_endpoint {
|
if $configure_endpoint {
|
||||||
|
@ -197,9 +94,9 @@ class glance::keystone::auth(
|
||||||
password => $password,
|
password => $password,
|
||||||
email => $email,
|
email => $email,
|
||||||
tenant => $tenant,
|
tenant => $tenant,
|
||||||
public_url => $public_url_real,
|
public_url => $public_url,
|
||||||
admin_url => $admin_url_real,
|
admin_url => $admin_url,
|
||||||
internal_url => $internal_url_real,
|
internal_url => $internal_url,
|
||||||
}
|
}
|
||||||
|
|
||||||
if $configure_user_role {
|
if $configure_user_role {
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
---
|
||||||
|
other:
|
||||||
|
- Removed deprecated options for glance::keystone::auth class.
|
|
@ -77,31 +77,6 @@ describe 'glance::keystone::auth' do
|
||||||
) }
|
) }
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'with deprecated endpoints parameters' do
|
|
||||||
|
|
||||||
let :params do
|
|
||||||
{
|
|
||||||
:password => 'pass',
|
|
||||||
:public_address => '10.0.0.1',
|
|
||||||
:admin_address => '10.0.0.2',
|
|
||||||
:internal_address => '10.0.0.3',
|
|
||||||
:port => '9393',
|
|
||||||
:region => 'RegionTwo',
|
|
||||||
:public_protocol => 'https',
|
|
||||||
:admin_protocol => 'https',
|
|
||||||
:internal_protocol => 'https'
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
it { is_expected.to contain_keystone_endpoint('RegionTwo/Image Service::image').with(
|
|
||||||
:ensure => 'present',
|
|
||||||
:public_url => 'https://10.0.0.1:9393',
|
|
||||||
:admin_url => 'https://10.0.0.2:9393',
|
|
||||||
:internal_url => 'https://10.0.0.3:9393'
|
|
||||||
)}
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'when endpoint is not set' do
|
describe 'when endpoint is not set' do
|
||||||
|
|
||||||
let :params do
|
let :params do
|
||||||
|
|
Loading…
Reference in New Issue