Remove deprecated neutron parameters
... because these were deprecated during 2024.2 cycle and can be replaced by the new parameters. Change-Id: I332f209da86f11b721cb674c8281006642012cf7
This commit is contained in:
@@ -52,14 +52,6 @@
|
|||||||
# (Optional) List of interfaces, in order of preference for endpoint URL.
|
# (Optional) List of interfaces, in order of preference for endpoint URL.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
# [*endpoint*]
|
|
||||||
# (Optional) Custom neutron endpoint if override is necessary.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*endpoint_type*]
|
|
||||||
# (Optional) Endpoint type in catalog to use for neutron.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
class octavia::neutron (
|
class octavia::neutron (
|
||||||
$auth_url = 'http://localhost:5000',
|
$auth_url = 'http://localhost:5000',
|
||||||
$username = 'neutron',
|
$username = 'neutron',
|
||||||
@@ -73,21 +65,10 @@ class octavia::neutron (
|
|||||||
$service_name = $facts['os_service_default'],
|
$service_name = $facts['os_service_default'],
|
||||||
$endpoint_override = $facts['os_service_default'],
|
$endpoint_override = $facts['os_service_default'],
|
||||||
$valid_interfaces = $facts['os_service_default'],
|
$valid_interfaces = $facts['os_service_default'],
|
||||||
# DEPRECATED PARMAETERS
|
|
||||||
$endpoint = undef,
|
|
||||||
$endpoint_type = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include octavia::deps
|
include octavia::deps
|
||||||
|
|
||||||
if $endpoint != undef {
|
|
||||||
warning('The endpoint parameter is deprecated. Use endpoint_override.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if $endpoint_type != undef {
|
|
||||||
warning('The endpoint_type parameter is deprecated. Use valid_interfaces.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if is_service_default($password) {
|
if is_service_default($password) {
|
||||||
warning('[neutron] section will require valid credential options in a future release')
|
warning('[neutron] section will require valid credential options in a future release')
|
||||||
}
|
}
|
||||||
@@ -113,7 +94,5 @@ class octavia::neutron (
|
|||||||
'neutron/service_name': value => $service_name;
|
'neutron/service_name': value => $service_name;
|
||||||
'neutron/endpoint_override': value => $endpoint_override;
|
'neutron/endpoint_override': value => $endpoint_override;
|
||||||
'neutron/valid_interfaces': value => join(any2array($valid_interfaces), ',');
|
'neutron/valid_interfaces': value => join(any2array($valid_interfaces), ',');
|
||||||
'neutron/endpoint': value => pick($endpoint, $facts['os_service_default']);
|
|
||||||
'neutron/endpoint_type': value => pick($endpoint_type, $facts['os_service_default']);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The following parameters of the ``octavia::neutron`` class have been
|
||||||
|
removed.
|
||||||
|
|
||||||
|
- ``endpoint``
|
||||||
|
- ``endpoint_type``
|
@@ -16,9 +16,6 @@ describe 'octavia::neutron' do
|
|||||||
is_expected.to contain_octavia_config('neutron/service_name').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_octavia_config('neutron/service_name').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_octavia_config('neutron/endpoint_override').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_octavia_config('neutron/endpoint_override').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_octavia_config('neutron/valid_interfaces').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_octavia_config('neutron/valid_interfaces').with_value('<SERVICE DEFAULT>')
|
||||||
|
|
||||||
is_expected.to contain_octavia_config('neutron/endpoint').with_value('<SERVICE DEFAULT>')
|
|
||||||
is_expected.to contain_octavia_config('neutron/endpoint_type').with_value('<SERVICE DEFAULT>')
|
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -55,20 +52,6 @@ describe 'octavia::neutron' do
|
|||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with deprecated parameters' do
|
|
||||||
let :params do
|
|
||||||
{
|
|
||||||
:endpoint => 'http://127.0.0.1:9696',
|
|
||||||
:endpoint_type => 'internalURL',
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
it {
|
|
||||||
is_expected.to contain_octavia_config('neutron/endpoint').with_value('http://127.0.0.1:9696')
|
|
||||||
is_expected.to contain_octavia_config('neutron/endpoint_type').with_value('internalURL')
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when system_scope is set' do
|
context 'when system_scope is set' do
|
||||||
let :params do
|
let :params do
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user