simplified fact generation

NTTCom-MS · Mar 30, 2020 · 1e0a6bc · 1e0a6bc
1 parent 19a48ec
commit 1e0a6bc
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 221 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.1.23
+
+* simplified **eypconf** fact generation
+
 ## 0.1.22
 
 * added **eypconf_location**

diff --git a/lib/facter/eypconf_customer.rb b/lib/facter/eypconf_customer.rb
diff --git a/lib/facter/eypconf_description.rb b/lib/facter/eypconf_description.rb
diff --git a/lib/facter/eypconf_env.rb b/lib/facter/eypconf_env.rb
diff --git a/lib/facter/eypconf_generic_id.rb b/lib/facter/eypconf_generic_id.rb
@@ -1,6 +1,6 @@
-Dir.entries("/etc/eypconf/id").select {|f| !File.directory? f}.each do |i|
+Dir.entries("/opt/eypconf/id").select {|f| !File.directory? f}.each do |i|
 
-  genetic_id = Facter::Util::Resolution.exec("bash -c 'cat /etc/eypconf/id/#{i}'").to_s
+  genetic_id = Facter::Util::Resolution.exec("bash -c 'cat /opt/eypconf/id/#{i}'").to_s
 
   if i[0]=='.'
     fact_name=i[1..-1]
@@ -15,7 +15,7 @@
         end
     end
 
-    Facter.add("eypconf_#{fact_name}|_uppercase") do
+    Facter.add("eypconf_#{fact_name}_uppercase") do
         setcode do
           genetic_id.upcase
         end

diff --git a/lib/facter/eypconf_location.rb b/lib/facter/eypconf_location.rb
diff --git a/lib/facter/eypconf_magic_hash.rb b/lib/facter/eypconf_magic_hash.rb
diff --git a/lib/facter/eypconf_platformid.rb b/lib/facter/eypconf_platformid.rb
diff --git a/lib/facter/eypconf_servergroup.rb b/lib/facter/eypconf_servergroup.rb
diff --git a/lib/facter/eypconf_sg.rb b/lib/facter/eypconf_sg.rb
diff --git a/lib/facter/eypconf_type.rb b/lib/facter/eypconf_type.rb
diff --git a/lib/facter/eypconf_userid.rb b/lib/facter/eypconf_userid.rb
diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "eyp-eyplib",
-  "version": "0.1.22",
+  "version": "0.1.23",
   "author": "eyp",
   "summary": "Utility functions for puppet modules",
   "license": "Apache-2.0",