-

README.md

-# Module CGX SYS, branche mars18_production
+# Module Puppet SYS

lib/facter/nodesgroup.rb

@@ -3,20 +3,20 @@ require 'facter'
 # nom hote de la forme abc123def -> récupère abc
 Facter.add(:groupname) do
   setcode do
-    Facter.value(:hostname)[/^([^\d]*)(\d*)(.*)$/,1]
+    Facter.value(:hostname)[/^([^\d-]*)(\d|-)*(.*)$/,1]
   end
 end
 
 # nom hote de la forme abc123def -> récupère 123
 Facter.add(:groupversion) do
   setcode do
-    Facter.value(:hostname)[/^([^\d]*)(\d*)(.*)$/,2]
+    Facter.value(:hostname)[/^([^\d-]*)(\d|-)*(.*)$/,2]
   end
 end
 
 # nom hote de la forme abc123def -> récupère def
 Facter.add(:clientid) do
   setcode do
-    Facter.value(:hostname)[/^([^\d]*)(\d*)(.*)$/,3]
+    Facter.value(:hostname)[/^([^\d-]*)(\d|-)*(.*)$/,3]
   end
 end