Removes logic dependent on 'odl_on_controller'

Since moving to composable service/roles there was some logic here that
was relying on a variable to enable ODL rather than enabling the service
itself to decide where ODL was enabled.  Now that ODL and ODL OVS
configuration are split into 2 different services we can make these
truly composable.

Partial-Bug: 1633625

Change-Id: Ia55c05e12d5d434111a13e1ed795da530e3ff4a5
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 ffe28ce..a3f46ec 100644 (file)
--- a/manifests/profile/base/neutron/opendaylight.pp
+++ b/manifests/profile/base/neutron/opendaylight.pp
@@ -39,7 +39,7 @@ class tripleo::profile::base::neutron::opendaylight (
 
   if $step >= 1 {
     # Configure ODL only on first controller
-    if hiera('odl_on_controller') and $primary_controller == downcase($::hostname) {
+    if $primary_controller == downcase($::hostname) {
       include ::opendaylight
     }
   }

diff --git a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
index f25aea6..db47cc3 100644 (file)
--- a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
@@ -38,12 +38,7 @@ class tripleo::profile::base::neutron::plugins::ml2::opendaylight (
 ) {
 
   if $step >= 4 {
-    # Figure out ODL IP
-    if hiera('odl_on_controller') {
-      $odl_url_ip = hiera('opendaylight_api_vip')
-    } else {
-      $odl_url_ip = hiera('opendaylight::odl_bind_ip')
-    }
+    $odl_url_ip = hiera('opendaylight_api_vip')
 
     if ! $odl_url_ip { fail('OpenDaylight Controller IP/VIP is Empty') }
 

diff --git a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
index 7548046..91c5168 100644 (file)
--- a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
+++ b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
@@ -48,14 +48,8 @@ class tripleo::profile::base::neutron::plugins::ovs::opendaylight (
 ) {
 
   if $step >= 4 {
-    # Figure out ODL IP (and VIP if on controller)
-    if hiera('odl_on_controller') {
-      $opendaylight_controller_ip = $odl_api_ips[0]
-      $odl_url_ip = hiera('opendaylight_api_vip')
-    } else {
-      $opendaylight_controller_ip = hiera('opendaylight::odl_bind_ip')
-      $odl_url_ip = $opendaylight_controller_ip
-    }
+    $opendaylight_controller_ip = $odl_api_ips[0]
+    $odl_url_ip = hiera('opendaylight_api_vip')
 
     if ! $opendaylight_controller_ip { fail('OpenDaylight Controller IP is Empty') }