Merge "Xenserver patch"
This commit is contained in:
commit
a62bf731fa
@ -74,6 +74,10 @@
|
|||||||
# Neutron will only schedule dhcp on the agent based on availability zone
|
# Neutron will only schedule dhcp on the agent based on availability zone
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
|
# [*ovs_integration_bridge*]
|
||||||
|
# (optional) Name of Open vSwitch bridge to use
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
# === Deprecated Parameters
|
# === Deprecated Parameters
|
||||||
#
|
#
|
||||||
# [*dhcp_domain*]
|
# [*dhcp_domain*]
|
||||||
@ -98,6 +102,7 @@ class neutron::agents::dhcp (
|
|||||||
$dhcp_broadcast_reply = $::os_service_default,
|
$dhcp_broadcast_reply = $::os_service_default,
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
$availability_zone = $::os_service_default,
|
$availability_zone = $::os_service_default,
|
||||||
|
$ovs_integration_bridge = $::os_service_default,
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$dhcp_domain = $::os_service_default,
|
$dhcp_domain = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
@ -133,6 +138,7 @@ class neutron::agents::dhcp (
|
|||||||
'DEFAULT/dhcp_broadcast_reply': value => $dhcp_broadcast_reply;
|
'DEFAULT/dhcp_broadcast_reply': value => $dhcp_broadcast_reply;
|
||||||
'DEFAULT/dnsmasq_config_file': value => $dnsmasq_config_file;
|
'DEFAULT/dnsmasq_config_file': value => $dnsmasq_config_file;
|
||||||
'DEFAULT/dnsmasq_dns_servers': value => join(any2array($dnsmasq_dns_servers), ',');
|
'DEFAULT/dnsmasq_dns_servers': value => join(any2array($dnsmasq_dns_servers), ',');
|
||||||
|
'DEFAULT/ovs_integration_bridge': value => $ovs_integration_bridge;
|
||||||
'AGENT/availability_zone': value => $availability_zone;
|
'AGENT/availability_zone': value => $availability_zone;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,6 +47,7 @@ describe 'neutron::agents::dhcp' do
|
|||||||
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/force_metadata').with_value('<SERVICE DEFAULT>');
|
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/force_metadata').with_value('<SERVICE DEFAULT>');
|
||||||
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/enable_metadata_network').with_value(p[:enable_metadata_network]);
|
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/enable_metadata_network').with_value(p[:enable_metadata_network]);
|
||||||
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_broadcast_reply').with_value('<SERVICE DEFAULT>');
|
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_broadcast_reply').with_value('<SERVICE DEFAULT>');
|
||||||
|
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/ovs_integration_bridge').with_value('<SERVICE DEFAULT>');
|
||||||
is_expected.to contain_neutron_dhcp_agent_config('AGENT/availability_zone').with_value('<SERVICE DEFAULT>');
|
is_expected.to contain_neutron_dhcp_agent_config('AGENT/availability_zone').with_value('<SERVICE DEFAULT>');
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user