openstack/puppet-nova
Code Issues Proposed changes

Remove deprecated nova::network::neutron params

Browse Source 
Change-Id: Icc5ca7dd9129d3bb61357baa1be7468cb7c842ed
This commit is contained in:
Tobias Urdin 2020-01-14 10:45:04 +01:00
parent 057a42297a
commit 7c7e07027a
3 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
manifests/network/neutron.pp
View File

@ -118,28 +118,11 @@ class nova::network::neutron (
$vif_plugging_timeout = '300',
$default_floating_pool = 'nova',
# DEPRECATED PARAMS
$neutron_url = undef,
$neutron_url_timeout = undef,
$firewall_driver = undef,
$dhcp_domain = undef,
) {
include nova::deps
if $neutron_url {
warning('nova::network::neutron::neutron_url is deprecated, nova behaviour will be default to looking up \
the neutron endpoint in the keystone catalog, please use nova::network::neutron::neutron_endpoint_override to override')
}
if $neutron_url_timeout {
warning('nova::network::neutron::neutron_url_timeout is deprecated, please use neutron_timeout instead.')
}
if $firewall_driver {
warning('nova::network::neutron::firewall_driver is deprecated and will be removed in a future release')
}
# TODO(mwhahaha): remove me when tripleo switches to use the metadata version
# of dhcp_domain
if $dhcp_domain != undef {
@ -148,22 +131,11 @@ class nova::network::neutron (
})
}
# TODO(tobias-urdin): Remove these in the T release.
nova_config {
'DEFAULT/firewall_driver': value => $firewall_driver;
}
nova_config {
'neutron/url': value => $neutron_url;
}
$neutron_timeout_real = pick($neutron_url_timeout, $neutron_timeout)
nova_config {
'DEFAULT/vif_plugging_is_fatal': value => $vif_plugging_is_fatal;
'DEFAULT/vif_plugging_timeout': value => $vif_plugging_timeout;
'neutron/default_floating_pool': value => $default_floating_pool;
'neutron/timeout': value => $neutron_timeout_real;
'neutron/timeout': value => $neutron_timeout;
'neutron/project_name': value => $neutron_project_name;
'neutron/project_domain_name': value => $neutron_project_domain_name;
'neutron/region_name': value => $neutron_region_name;

9
releasenotes/notes/remove-deprecated-network-neutron-3e31bdda08e9068f.yaml Normal file
View File

@ -0,0 +1,9 @@
---
upgrade:
- |
The deprecated parameter neutron_url in nova::network::neutron is removed.
- |
The deprecated parameter neutron_url_timeout in nova::network::neutron is removed.
Please use the neutron_timeout parameter instead.
- |
The deprecated parameter firewall_driver in nova::network::neutron is removed.

11
spec/classes/nova_network_neutron_spec.rb
View File

@ -97,21 +97,12 @@ describe 'nova::network::neutron' do
context 'with deprecated class parameters' do
before do
params.merge!(
:neutron_url => 'http://10.0.0.1:9696',
:neutron_url_timeout => '30',
:firewall_driver => 'nova.virt.firewall.IptablesFirewallDriver',
:dhcp_domain => 'foo',
:dhcp_domain => 'foo',
)
end
it 'configures neutron endpoint in nova.conf' do
should contain_nova_config('api/dhcp_domain').with_value(params[:dhcp_domain])
should contain_nova_config('neutron/url').with_value(params[:neutron_url])
should contain_nova_config('neutron/timeout').with_value(params[:neutron_url_timeout])
end
it 'configures Nova to use Neutron Security Groups and Firewall' do
should contain_nova_config('DEFAULT/firewall_driver').with_value(params[:firewall_driver])
end
end
end