Merge branch 'fix_gen_dhcp' into 'master'

Remove several generator useless warnings for servers and VM in DHCP, conman and lanpower gen

See merge request !1069

lib/refrepo/gen/puppet/lanpowerg5k.rb

@@ -31,7 +31,7 @@ def generate_puppet_lanpowerg5k(options)
 
     # Generate config for both cluster and server entries of the refapi
     site_refapi['servers'] ||= {}
-    cluster_list = site_refapi['clusters'].keys | site_refapi['servers'].keys | config[site_uid].keys | credentials[site_uid].keys
+    cluster_list = site_refapi['clusters'].keys | config[site_uid].keys | credentials[site_uid].keys
 
     cluster_list.sort.each { |cluster_uid|
       cluster_refapi      = site_refapi['clusters'][cluster_uid].fetch('nodes') rescue site_refapi['servers'][cluster_uid].fetch('nodes') rescue nil

lib/refrepo/gen/puppet/templates/conman.erb

@@ -28,12 +28,13 @@ server logfile="/var/log/conman.log"
   #
   # * from conf/console-password.yaml: passwd hash
 
-  # Generate conman config for both cluster and server entries of the refapi
+  # Generate conman config for clusters of the refapi
   site_refapi['servers'] ||= {}
-  cluster_list = site_refapi.fetch('clusters', {}).keys | site_refapi['servers'].keys | site_config.keys | site_credentials.keys
+  cluster_list = site_refapi.fetch('clusters', {}).keys | site_config.keys | site_credentials.keys
   
-  cluster_list.sort.each { |cluster_uid| 
-    cluster_refapi      = site_refapi['clusters'][cluster_uid].fetch('nodes') rescue site_refapi['servers'][cluster_uid].fetch('nodes') rescue nil
+  cluster_list.sort.each { |cluster_uid|
+
+    cluster_refapi      = site_refapi['clusters'][cluster_uid].fetch('nodes') rescue nil
     cluster_config      = site_config[cluster_uid]['conman'] rescue nil
     cluster_credentials = site_credentials.fetch(cluster_uid) rescue nil                                             
     

lib/refrepo/gen/puppet/templates/dhcp.erb

@@ -9,7 +9,7 @@
     dhcp_entries = []
 
     data.fetch('nodes').each_sort_by_node_uid { |node_uid, node|
-      next if node == nil || (node['status'] && node['status'] == 'retired')
+      next if node == nil || (node['status'] && node['status'] == 'retired') || node['kind'] == 'virtual'
 
       # Get ipv4, ipv6 and mac addresses
       begin