diff --git a/manifests/agents/ml2/networking_baremetal.pp b/manifests/agents/ml2/networking_baremetal.pp index 711494203..f3b901c7d 100644 --- a/manifests/agents/ml2/networking_baremetal.pp +++ b/manifests/agents/ml2/networking_baremetal.pp @@ -121,9 +121,6 @@ class neutron::agents::ml2::networking_baremetal ( $retry_interval = $::os_service_default, $max_retries = $::os_service_default, $purge_config = false, - # DEPRECATED PARAMETERS - $project_domain_id = undef, - $user_domain_id = undef, ) { include neutron::deps @@ -157,22 +154,6 @@ class neutron::agents::ml2::networking_baremetal ( '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': ensure => $package_ensure, name => $::neutron::params::networking_baremetal_agent_package, diff --git a/manifests/server/placement.pp b/manifests/server/placement.pp index c0be773dc..0fbd51308 100644 --- a/manifests/server/placement.pp +++ b/manifests/server/placement.pp @@ -56,16 +56,6 @@ # the keystone catalog. # 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 ( $password, $auth_type = 'password', @@ -76,9 +66,6 @@ class neutron::server::placement ( $auth_url = 'http://127.0.0.1:5000', $region_name = $::os_service_default, $endpoint_type = $::os_service_default, - # DEPRECATED PARAMETERS - $project_domain_id = undef, - $user_domain_id = undef, ) { include neutron::deps @@ -94,20 +81,4 @@ class neutron::server::placement ( 'placement/endpoint_type': value => $endpoint_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; - } - } } diff --git a/releasenotes/notes/remove-deprecated-domain_id-0e2553556573da61.yaml b/releasenotes/notes/remove-deprecated-domain_id-0e2553556573da61.yaml new file mode 100644 index 000000000..8af9e08c1 --- /dev/null +++ b/releasenotes/notes/remove-deprecated-domain_id-0e2553556573da61.yaml @@ -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`` + diff --git a/spec/classes/neutron_server_placement_spec.rb b/spec/classes/neutron_server_placement_spec.rb index 7d7cd4e42..bd11e71ee 100644 --- a/spec/classes/neutron_server_placement_spec.rb +++ b/spec/classes/neutron_server_placement_spec.rb @@ -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_secret( true ) should contain_neutron_config('placement/region_name').with_value('') - should_not contain_neutron_config('placement/project_domain_id') 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/endpoint_type').with_value('') end @@ -50,9 +48,7 @@ describe 'neutron::server::placement' do :auth_type => 'password', :username => 'joe', :region_name => 'MyRegion', - :project_domain_id => 'default_1', :project_domain_name => 'Default_2', - :user_domain_id => 'default_3', :user_domain_name => 'Default_4', :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_secret( true ) 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/user_domain_id').with_value('default_3') should contain_neutron_config('placement/user_domain_name').with_value('Default_4') should contain_neutron_config('placement/endpoint_type').with_value('internal') end