openstack/puppet-neutron
Code Issues Proposed changes

Merge "dhcp-agent: Hard-code default of [DEFAULT] force_metadata"

Browse Source
This commit is contained in:
Zuul
2022-04-05 16:38:44 +00:00
committed by Gerrit Code Review
parent ef51c8ff8b 9be4bfcc2f
commit 1965523467
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/agents/dhcp.pp
View File

@@ -70,7 +70,7 @@
# #
# [*enable_force_metadata*] # [*enable_force_metadata*]
# (optional) enable metadata support on all networks. # (optional) enable metadata support on all networks.
# Defaults to $::os_service_default # Defaults to false.
# #
# [*enable_metadata_network*] # [*enable_metadata_network*]
# (optional) Allows for serving metadata requests coming from a dedicated metadata # (optional) Allows for serving metadata requests coming from a dedicated metadata
@@ -140,7 +140,7 @@ class neutron::agents::dhcp (
$dnsmasq_lease_max = $::os_service_default, $dnsmasq_lease_max = $::os_service_default,
$dnsmasq_enable_addr6_list = $::os_service_default, $dnsmasq_enable_addr6_list = $::os_service_default,
$enable_isolated_metadata = false, $enable_isolated_metadata = false,
$enable_force_metadata = $::os_service_default, $enable_force_metadata = false,
$enable_metadata_network = false, $enable_metadata_network = false,
$dhcp_broadcast_reply = $::os_service_default, $dhcp_broadcast_reply = $::os_service_default,
$purge_config = false, $purge_config = false,
@@ -157,15 +157,19 @@ class neutron::agents::dhcp (
include neutron::deps include neutron::deps
include neutron::params include neutron::params
validate_legacy('Boolean', 'validate_bool', $enable_isolated_metadata)
validate_legacy('Boolean', 'validate_bool', $enable_force_metadata)
validate_legacy('Boolean', 'validate_bool', $enable_metadata_network)
if (! ($enable_isolated_metadata or $enable_force_metadata)) and $enable_metadata_network { if (! ($enable_isolated_metadata or $enable_force_metadata)) and $enable_metadata_network {
fail('enable_metadata_network to true requires enable_isolated_metadata or enable_force_metadata also enabled.') fail('enable_metadata_network to true requires enable_isolated_metadata or enable_force_metadata also enabled.')
} else { }
neutron_dhcp_agent_config { neutron_dhcp_agent_config {
'DEFAULT/enable_isolated_metadata': value => $enable_isolated_metadata; 'DEFAULT/enable_isolated_metadata': value => $enable_isolated_metadata;
'DEFAULT/force_metadata': value => $enable_force_metadata; 'DEFAULT/force_metadata': value => $enable_force_metadata;
'DEFAULT/enable_metadata_network': value => $enable_metadata_network; 'DEFAULT/enable_metadata_network': value => $enable_metadata_network;
} }
}
resources { 'neutron_dhcp_agent_config': resources { 'neutron_dhcp_agent_config':
purge => $purge_config, purge => $purge_config,

3
spec/classes/neutron_agents_dhcp_spec.rb
View File

@@ -17,6 +17,7 @@ describe 'neutron::agents::dhcp' do
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver', :interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
:root_helper => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', :root_helper => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
:enable_isolated_metadata => false, :enable_isolated_metadata => false,
:enable_force_metadata => false,
:enable_metadata_network => false, :enable_metadata_network => false,
:purge_config => false :purge_config => false
} }
@@ -37,7 +38,7 @@ describe 'neutron::agents::dhcp' do
should contain_neutron_dhcp_agent_config('DEFAULT/dhcp_driver').with_value('<SERVICE DEFAULT>'); should contain_neutron_dhcp_agent_config('DEFAULT/dhcp_driver').with_value('<SERVICE DEFAULT>');
should contain_neutron_dhcp_agent_config('DEFAULT/root_helper').with_value(p[:root_helper]); should contain_neutron_dhcp_agent_config('DEFAULT/root_helper').with_value(p[:root_helper]);
should contain_neutron_dhcp_agent_config('DEFAULT/enable_isolated_metadata').with_value(p[:enable_isolated_metadata]); should contain_neutron_dhcp_agent_config('DEFAULT/enable_isolated_metadata').with_value(p[:enable_isolated_metadata]);
should contain_neutron_dhcp_agent_config('DEFAULT/force_metadata').with_value('<SERVICE DEFAULT>'); should contain_neutron_dhcp_agent_config('DEFAULT/force_metadata').with_value(p[:enable_force_metadata]);
should contain_neutron_dhcp_agent_config('DEFAULT/enable_metadata_network').with_value(p[:enable_metadata_network]); should contain_neutron_dhcp_agent_config('DEFAULT/enable_metadata_network').with_value(p[:enable_metadata_network]);
should contain_neutron_dhcp_agent_config('DEFAULT/dhcp_broadcast_reply').with_value('<SERVICE DEFAULT>'); should contain_neutron_dhcp_agent_config('DEFAULT/dhcp_broadcast_reply').with_value('<SERVICE DEFAULT>');
should contain_neutron_dhcp_agent_config('DEFAULT/dnsmasq_local_resolv').with_value('<SERVICE DEFAULT>'); should contain_neutron_dhcp_agent_config('DEFAULT/dnsmasq_local_resolv').with_value('<SERVICE DEFAULT>');