-localinfo.keys.sort.each do |node|
- if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
- nagii << 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']