Remove nova::network::neutron::dhcp_domain
The removal of dhcp_domain parameter in nova::network::neutron was reverted ans pended because of the failure in tripleo, but as tripleo now use the newer parameter under nova::metadata, we can safely drop the parameter now. Change-Id: Iaaf0c3fe4312915e59b5b1680e63f925f6c8511a
This commit is contained in:
@@ -79,27 +79,6 @@
|
|||||||
# (optional) Default pool for floating IPs
|
# (optional) Default pool for floating IPs
|
||||||
# Defaults to 'nova'
|
# Defaults to 'nova'
|
||||||
#
|
#
|
||||||
### DEPRECATED PARAMS
|
|
||||||
#
|
|
||||||
# [*neutron_url*]
|
|
||||||
# (optional) URL for connecting to the Neutron networking service.
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# [*neutron_url_timeout*]
|
|
||||||
# (optional) Timeout value for connecting to neutron in seconds.
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# [*firewall_driver*]
|
|
||||||
# (optional) Firewall driver.
|
|
||||||
# This prevents nova from maintaining a firewall so it does not interfere
|
|
||||||
# with Neutron's. Set to 'nova.virt.firewall.IptablesFirewallDriver'
|
|
||||||
# to re-enable the Nova firewall.
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# [*dhcp_domain*]
|
|
||||||
# (optional) domain to use for building the hostnames
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
class nova::network::neutron (
|
class nova::network::neutron (
|
||||||
$neutron_password = false,
|
$neutron_password = false,
|
||||||
$neutron_auth_type = 'v3password',
|
$neutron_auth_type = 'v3password',
|
||||||
@@ -117,20 +96,10 @@ class nova::network::neutron (
|
|||||||
$vif_plugging_is_fatal = true,
|
$vif_plugging_is_fatal = true,
|
||||||
$vif_plugging_timeout = '300',
|
$vif_plugging_timeout = '300',
|
||||||
$default_floating_pool = 'nova',
|
$default_floating_pool = 'nova',
|
||||||
# DEPRECATED PARAMS
|
|
||||||
$dhcp_domain = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include nova::deps
|
include nova::deps
|
||||||
|
|
||||||
# TODO(mwhahaha): remove me when tripleo switches to use the metadata version
|
|
||||||
# of dhcp_domain
|
|
||||||
if $dhcp_domain != undef {
|
|
||||||
ensure_resource('nova_config', 'api/dhcp_domain', {
|
|
||||||
value => $dhcp_domain
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
nova_config {
|
nova_config {
|
||||||
'DEFAULT/vif_plugging_is_fatal': value => $vif_plugging_is_fatal;
|
'DEFAULT/vif_plugging_is_fatal': value => $vif_plugging_is_fatal;
|
||||||
'DEFAULT/vif_plugging_timeout': value => $vif_plugging_timeout;
|
'DEFAULT/vif_plugging_timeout': value => $vif_plugging_timeout;
|
||||||
|
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The deprecated parameter dhcp_domain in nova::network::neutron is removed.
|
||||||
|
Please use the nova::metadata::dhcp_domain parameter instead.
|
@@ -93,18 +93,6 @@ describe 'nova::network::neutron' do
|
|||||||
should contain_nova_config('DEFAULT/vif_plugging_timeout').with_value(params[:vif_plugging_timeout])
|
should contain_nova_config('DEFAULT/vif_plugging_timeout').with_value(params[:vif_plugging_timeout])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with deprecated class parameters' do
|
|
||||||
before do
|
|
||||||
params.merge!(
|
|
||||||
:dhcp_domain => 'foo',
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'configures neutron endpoint in nova.conf' do
|
|
||||||
should contain_nova_config('api/dhcp_domain').with_value(params[:dhcp_domain])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
on_supported_os({
|
on_supported_os({
|
||||||
|
Reference in New Issue
Block a user