Default neutron dhcp_agents_per_network to number of agents

This patch will set neutron's dhcp_agents_per_network equal to the
number of deployed neutron DHCP agents unless otherwise explicitly set.

Conflicts:
	manifests/profile/base/neutron.pp

Note: spec/classes/tripleo_profile_base_neutron_spec.rb removed from
backport as it required defining the neutron class as a precondition to
satisfy a requirement for a rabbit password. This leads to a duplicate
definition.

Partial-bug: #1632721
Change-Id: I5533e42c5ba9f72cc70d80489a07e30ee2341198
(cherry picked from commit 52a68ffc8f)
(cherry picked from commit 4b3ff75371)
This commit is contained in:
Brent Eagles 2017-02-24 11:52:11 -03:30
parent e2885f4d1f
commit d1d38fb26a
2 changed files with 34 additions and 1 deletions

View File

@ -29,16 +29,44 @@
# [*rabbit_port*]
# IP port for rabbitmq service
# Defaults to hiera('neutron::rabbit_port', 5672
#
# [*dhcp_agents_per_network*]
# (Optional) TripleO configured number of DHCP agents
# to use per network. If left to the default value, neutron will be
# configured with the number of DHCP agents being deployed.
# Defaults to undef
#
# [*dhcp_nodes*]
# (Optional) List of nodes running the DHCP agent. Used to
# set neutron's dhcp_agents_per_network value to the number
# of available agents.
# Defaults to hiera('neutron_dhcp_short_node_names') or []
#
class tripleo::profile::base::neutron (
$step = hiera('step'),
$rabbit_hosts = hiera('rabbitmq_node_ips', undef),
$rabbit_port = hiera('neutron::rabbit_port', 5672),
$dhcp_agents_per_network = undef,
$dhcp_nodes = hiera('neutron_dhcp_short_node_names', []),
) {
if $step >= 3 {
$rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
$dhcp_agent_count = size($dhcp_nodes)
if $dhcp_agents_per_network {
$dhcp_agents_per_net = $dhcp_agents_per_network
if ($dhcp_agents_per_net > $dhcp_agent_count) {
warning("dhcp_agents_per_network (${dhcp_agents_per_net}) is greater\
than the number of deployed dhcp agents (${dhcp_agent_count})")
}
}
elsif $dhcp_agent_count > 0 {
$dhcp_agents_per_net = $dhcp_agent_count
}
class { '::neutron' :
rabbit_hosts => $rabbit_endpoints,
rabbit_hosts => $rabbit_endpoints,
dhcp_agents_per_network => $dhcp_agents_per_net,
}
include ::neutron::config
}

View File

@ -0,0 +1,5 @@
---
features: |
- Unless a non-default value is provided, the dhcp_agents_per_network
neutron configuration variable is set to the number of deployed
neutron dhcp agents.