From: Tim Rozet <trozet@redhat.com>
Date: Tue, 20 Dec 2016 18:40:57 +0000 (-0500)
Subject: Decouples neutron services from OpenDaylight API service
X-Git-Tag: opnfv-6.0.0~448
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1adc49a38985a884ca66643bc528e1c3298a75e1;p=apex-puppet-tripleo.git

Decouples neutron services from OpenDaylight API service

Removes including Neutron services in the OpenDaylight API service.
This was breaking custom roles when splitting up OpenDaylight and Neutron
into different roles.  Also, references to "controller" are removed
because with custom roles OpenDaylight could be isolated to any role
type.  The 'bootstrap_nodeid' still works with any role, and only
resolves to the first node in the series of nodes for that role type.

Partial-Bug: 1651499

Change-Id: I418643810ee6b8a2c17a4754c83453140ebe39c7
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/manifests/profile/base/neutron/opendaylight.pp b/manifests/profile/base/neutron/opendaylight.pp
index a3f46ec..556fe63 100644
--- a/manifests/profile/base/neutron/opendaylight.pp
+++ b/manifests/profile/base/neutron/opendaylight.pp
@@ -22,24 +22,19 @@
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
-# [*primary_controller*]
-#   (Optional) The hostname of the first controller
+# [*primary_node*]
+#   (Optional) The hostname of the first node of this role type
 #   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::base::neutron::opendaylight (
-  $step = hiera('step'),
-  $primary_controller = hiera('bootstrap_nodeid', undef),
+  $step         = hiera('step'),
+  $primary_node = hiera('bootstrap_nodeid', undef),
 ) {
 
-  include ::tripleo::profile::base::neutron
-
-  if ! str2bool(hiera('opendaylight::enable_l3')) {
-    include ::tripleo::profile::base::neutron::l3
-  }
-
   if $step >= 1 {
-    # Configure ODL only on first controller
-    if $primary_controller == downcase($::hostname) {
+    # Configure ODL only on first node of the role where this service is
+    # applied
+    if $primary_node == downcase($::hostname) {
       include ::opendaylight
     }
   }