From 4b3ff753717e926a64df0173f1dafab38e41de0b Mon Sep 17 00:00:00 2001
From: Brent Eagles <beagles@redhat.com>
Date: Fri, 24 Feb 2017 11:52:11 -0330
Subject: 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 52a68ffc8f060e1961458a524e5861cea02d1c1c)
---
 manifests/profile/base/neutron.pp                  | 30 +++++++++++++++++++++-
 ...e-dhcp-agents-per-network-3089c5e7b15f8b7b.yaml |  5 ++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/calculate-dhcp-agents-per-network-3089c5e7b15f8b7b.yaml

diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp
index e6a32db..1ea7562 100644
--- a/manifests/profile/base/neutron.pp
+++ b/manifests/profile/base/neutron.pp
@@ -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_names', undef),
   $rabbit_port  = hiera('neutron::rabbit_port', 5672),
+  $dhcp_agents_per_network = undef,
+  $dhcp_nodes              = hiera('neutron_dhcp_short_node_names', []),
 ) {
   if $step >= 3 {
+    $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
+    }
+
     $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::neutron' :
-      rabbit_hosts => $rabbit_endpoints,
+      rabbit_hosts            => $rabbit_endpoints,
+      dhcp_agents_per_network => $dhcp_agents_per_net,
     }
     include ::neutron::config
   }
diff --git a/releasenotes/notes/calculate-dhcp-agents-per-network-3089c5e7b15f8b7b.yaml b/releasenotes/notes/calculate-dhcp-agents-per-network-3089c5e7b15f8b7b.yaml
new file mode 100644
index 0000000..800cedc
--- /dev/null
+++ b/releasenotes/notes/calculate-dhcp-agents-per-network-3089c5e7b15f8b7b.yaml
@@ -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.
-- 
cgit 1.2.3-korg