-scope.lookupvar('site::localinfo').keys.sort.each do |node|
- if scope.lookupvar('site::localinfo')[node]['nagiosmaster'] or scope.lookupvar('site::localinfo')[node]['extranrpeclient']
- nagii << scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber']
- end
+roles = scope.lookupvar('site::roles')
+roles['nagiosmaster'].each do |nag|
+ nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber']
+end
+roles['extranrpeclient'].each do |nag|
+ nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber']