x
/
fuel-plugin-opendaylight
Code Issues Proposed changes

Mend standalone mode condition 

Take into account roles with hiera_override task explicitly
in order to get standalone true mode.

Change-Id: I45cdf1aeea297a0875e542beeac2ca32d63cdf0d
This commit is contained in:
Michael Polenchuk 2017-02-07 12:09:13 +04:00
parent 001dc03a06
commit 6aa47a6ad6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment_scripts/puppet/modules/opendaylight/manifests/hiera_override.pp
View File

@ -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,