From 6aa47a6ad6f45175ce9f645d1ac171e0129507b2 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Tue, 7 Feb 2017 12:09:13 +0400 Subject: [PATCH] Mend standalone mode condition Take into account roles with hiera_override task explicitly in order to get standalone true mode. Change-Id: I45cdf1aeea297a0875e542beeac2ca32d63cdf0d --- .../puppet/modules/opendaylight/manifests/hiera_override.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/hiera_override.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/hiera_override.pp index d9b13b5..3d75395 100644 --- a/deployment_scripts/puppet/modules/opendaylight/manifests/hiera_override.pp +++ b/deployment_scripts/puppet/modules/opendaylight/manifests/hiera_override.pp @@ -6,7 +6,10 @@ class opendaylight::hiera_override { $orig_network_scheme = hiera_hash('network_scheme') $network_scheme = odl_network_scheme($opendaylight::odl_settings['enable_bgpvpn'], $orig_network_scheme) $ovsdb_managers = odl_ovsdb_managers($opendaylight::odl_mgmt_ips) - $standalone_mode = roles_include(['opendaylight']) and size(hiera('roles')) == 1 + + # exclude overridden configuration w/o neighbor roles + $neighbors = ['primary-controller', 'controller', 'compute'] + $standalone_mode = roles_include(['opendaylight']) and !roles_include($neighbors) $odl_hiera_yaml = odl_hiera_overrides( $opendaylight::odl_settings,