Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Normation · Nov 6, 2014 · b798b25 · b798b25
2 parents 9791e72 + 2c161e7
commit b798b25
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/rudder-webapp/SOURCES/rudder-node-to-relay b/rudder-webapp/SOURCES/rudder-node-to-relay
@@ -165,7 +165,7 @@ isDynamic: TRUE
 nodeGroupId: hasPolicyServer-${RELAY_UUID}
 isSystem: TRUE
 isEnabled: TRUE
-jsonNodeGroupQuery: {"select":"node","composition":"And","where":[{"objectType":"node","attribute":"policyServerId","comparator":"eq","value":"${RELAY_UUID}"}]}
+jsonNodeGroupQuery: {"select":"nodeAndPolicyServer","composition":"And","where":[{"objectType":"node","attribute":"policyServerId","comparator":"eq","value":"${RELAY_UUID}"}]}
 ${EXISTING_NODEID}
 
 dn: ruleTarget=policyServer:${RELAY_UUID},groupCategoryId=SystemGroups,groupCategoryId=GroupRoot,ou=Rudder,cn=rudder-configuration