Fixes #6454: networks.conf empty on relay #839
Conversation
|
Something need to be done for the "policy_server" class too, but it should be done in another issue I think |
| //scenario lead to the removal (or non addition) of them | ||
| nodes ++ allNodes.collect { case(k,n) if(n._2.size>0 || n._1 == Constants.ROOT_POLICY_SERVER_ID) => k } | ||
| // all nodes with server roles or policyServer (ie relay) | ||
| nodes ++ allNodes.collect { case(k,n) if(n._2.size>0 || n._1) => k } |
There was a problem hiding this comment.
If I understand correctly, you are always adding k in the node; for there always is a n._1
this looks plain wrong
There was a problem hiding this comment.
N._1 is a boolean meaning that the node is a policyServer ( either the root server or a relay)
Maybe I should explicit the tuple here by having ( nodeId, ( isPolicyServer, server roles)) inster of (k,n)
The code before was completely wrong ( comparing a boolean and a string)
There was a problem hiding this comment.
ho, so it was before in another file ( see PR https://github.com/Normation/rudder/pull/824/files ) and that broke it.
|
PR updated |
VinceMacBuche
force-pushed
the
bug_6454/networks_conf_empty_on_relay
branch
from
371f9ff
to
8280b13
Compare
| nodes ++ allNodes.collect { | ||
| case (nodeId,(isPolicyServer, roles)) | ||
| if isANodeWithRole(nodeId,isPolicyServer,roles) | ||
| => nodeId |
There was a problem hiding this comment.
please, please, can you use enclosing { } ?
VinceMacBuche
force-pushed
the
bug_6454/networks_conf_empty_on_relay
branch
from
8280b13
to
6445303
Compare
|
PR updated |
…ty_on_relay Fixes #6454: networks.conf empty on relay
http://www.rudder-project.org/redmine/issues/6454