Remove deprecated domain_id parameters
This change cleans up remainig domain_id parameters which were
deprecated during the Ussuri cycle[1].
[1] dfeccd6749
Change-Id: Ib5a1322ff71c3174d2667362e098133ebbd4b9e2
This commit is contained in:
parent
569bb8c0d3
commit
4b39bef363
|
@ -121,9 +121,6 @@ class neutron::agents::ml2::networking_baremetal (
|
||||||
$retry_interval = $::os_service_default,
|
$retry_interval = $::os_service_default,
|
||||||
$max_retries = $::os_service_default,
|
$max_retries = $::os_service_default,
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$project_domain_id = undef,
|
|
||||||
$user_domain_id = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include neutron::deps
|
include neutron::deps
|
||||||
|
@ -157,22 +154,6 @@ class neutron::agents::ml2::networking_baremetal (
|
||||||
'ironic/max_retries': value => $max_retries;
|
'ironic/max_retries': value => $max_retries;
|
||||||
}
|
}
|
||||||
|
|
||||||
if $project_domain_id != undef {
|
|
||||||
warning('project_domain_id is deprecated and will be removed in a future release. \
|
|
||||||
Use project_domain_name instead')
|
|
||||||
ironic_neutron_agent_config {
|
|
||||||
'ironic/project_domain_id': value => $project_domain_id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if $user_domain_id != undef {
|
|
||||||
warning('user_domain_id is deprecated and will be removed in a future release. \
|
|
||||||
Use user_domain_name instead')
|
|
||||||
ironic_neutron_agent_config {
|
|
||||||
'ironic/user_domain_id': value => $user_domain_id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
package { 'python-ironic-neutron-agent':
|
package { 'python-ironic-neutron-agent':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
name => $::neutron::params::networking_baremetal_agent_package,
|
name => $::neutron::params::networking_baremetal_agent_package,
|
||||||
|
|
|
@ -56,16 +56,6 @@
|
||||||
# the keystone catalog.
|
# the keystone catalog.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*project_domain_id*]
|
|
||||||
# (optional) Nova project's domain ID
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# [*user_domain_id*]
|
|
||||||
# (optional) User's domain ID for connection to nova in admin context
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
class neutron::server::placement (
|
class neutron::server::placement (
|
||||||
$password,
|
$password,
|
||||||
$auth_type = 'password',
|
$auth_type = 'password',
|
||||||
|
@ -76,9 +66,6 @@ class neutron::server::placement (
|
||||||
$auth_url = 'http://127.0.0.1:5000',
|
$auth_url = 'http://127.0.0.1:5000',
|
||||||
$region_name = $::os_service_default,
|
$region_name = $::os_service_default,
|
||||||
$endpoint_type = $::os_service_default,
|
$endpoint_type = $::os_service_default,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$project_domain_id = undef,
|
|
||||||
$user_domain_id = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include neutron::deps
|
include neutron::deps
|
||||||
|
@ -94,20 +81,4 @@ class neutron::server::placement (
|
||||||
'placement/endpoint_type': value => $endpoint_type;
|
'placement/endpoint_type': value => $endpoint_type;
|
||||||
'placement/auth_type': value => $auth_type;
|
'placement/auth_type': value => $auth_type;
|
||||||
}
|
}
|
||||||
|
|
||||||
if $project_domain_id != undef {
|
|
||||||
warning('project_domain_id is deprecated and will be removed in a future release. \
|
|
||||||
Use project_domain_name instead')
|
|
||||||
neutron_config {
|
|
||||||
'placement/project_domain_id': value => $project_domain_id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if $user_domain_id != undef {
|
|
||||||
warning('user_domain_id is deprecated and will be removed in a future release. \
|
|
||||||
Use user_domain_name instead')
|
|
||||||
neutron_config {
|
|
||||||
'placement/user_domain_id': value => $user_domain_id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The following deprecated parameters have been removed.
|
||||||
|
|
||||||
|
- ``neutron::ml2::server::placement::project_domain_id``
|
||||||
|
- ``neutron::ml2::server::placement::user_domain_id``
|
||||||
|
- ``neutron::ml2::networking_baremetal::project_domain_id``
|
||||||
|
- ``neutron::ml2::networking_baremetal::user_domain_id``
|
||||||
|
|
|
@ -36,9 +36,7 @@ describe 'neutron::server::placement' do
|
||||||
should contain_neutron_config('placement/password').with_value('secrete')
|
should contain_neutron_config('placement/password').with_value('secrete')
|
||||||
should contain_neutron_config('placement/password').with_secret( true )
|
should contain_neutron_config('placement/password').with_secret( true )
|
||||||
should contain_neutron_config('placement/region_name').with_value('<SERVICE DEFAULT>')
|
should contain_neutron_config('placement/region_name').with_value('<SERVICE DEFAULT>')
|
||||||
should_not contain_neutron_config('placement/project_domain_id')
|
|
||||||
should contain_neutron_config('placement/project_domain_name').with_value('Default')
|
should contain_neutron_config('placement/project_domain_name').with_value('Default')
|
||||||
should_not contain_neutron_config('placement/user_domain_id')
|
|
||||||
should contain_neutron_config('placement/user_domain_name').with_value('Default')
|
should contain_neutron_config('placement/user_domain_name').with_value('Default')
|
||||||
should contain_neutron_config('placement/endpoint_type').with_value('<SERVICE DEFAULT>')
|
should contain_neutron_config('placement/endpoint_type').with_value('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
|
@ -50,9 +48,7 @@ describe 'neutron::server::placement' do
|
||||||
:auth_type => 'password',
|
:auth_type => 'password',
|
||||||
:username => 'joe',
|
:username => 'joe',
|
||||||
:region_name => 'MyRegion',
|
:region_name => 'MyRegion',
|
||||||
:project_domain_id => 'default_1',
|
|
||||||
:project_domain_name => 'Default_2',
|
:project_domain_name => 'Default_2',
|
||||||
:user_domain_id => 'default_3',
|
|
||||||
:user_domain_name => 'Default_4',
|
:user_domain_name => 'Default_4',
|
||||||
:endpoint_type => 'internal'
|
:endpoint_type => 'internal'
|
||||||
)
|
)
|
||||||
|
@ -65,9 +61,7 @@ describe 'neutron::server::placement' do
|
||||||
should contain_neutron_config('placement/password').with_value('secrete')
|
should contain_neutron_config('placement/password').with_value('secrete')
|
||||||
should contain_neutron_config('placement/password').with_secret( true )
|
should contain_neutron_config('placement/password').with_secret( true )
|
||||||
should contain_neutron_config('placement/region_name').with_value('MyRegion')
|
should contain_neutron_config('placement/region_name').with_value('MyRegion')
|
||||||
should contain_neutron_config('placement/project_domain_id').with_value('default_1')
|
|
||||||
should contain_neutron_config('placement/project_domain_name').with_value('Default_2')
|
should contain_neutron_config('placement/project_domain_name').with_value('Default_2')
|
||||||
should contain_neutron_config('placement/user_domain_id').with_value('default_3')
|
|
||||||
should contain_neutron_config('placement/user_domain_name').with_value('Default_4')
|
should contain_neutron_config('placement/user_domain_name').with_value('Default_4')
|
||||||
should contain_neutron_config('placement/endpoint_type').with_value('internal')
|
should contain_neutron_config('placement/endpoint_type').with_value('internal')
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue