From 4cf346d257611f88a00d30350c3d062fd32cd83e Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 17 Oct 2016 11:29:10 -0400 Subject: 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 --- manifests/profile/base/neutron/opendaylight.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/profile/base/neutron/opendaylight.pp') diff --git a/manifests/profile/base/neutron/opendaylight.pp b/manifests/profile/base/neutron/opendaylight.pp index ffe28ce..a3f46ec 100644 --- 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 } } -- cgit 1.2.3-korg