summaryrefslogtreecommitdiff
path: root/lib/facter
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-10-25 10:41:52 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-10-25 10:41:52 -0700
commitd6d23b495cda0e154b4e73982acc43e586564c0e (patch)
tree8a737533940ddd4c6ea9ac4170a9e2f58ffa2709 /lib/facter
parent74e6411157b8df1af9a24c17971e3236f3096529 (diff)
Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x"
This reverts commit 74e6411157b8df1af9a24c17971e3236f3096529, reversing changes made to 417d219aa6e42f2a16af42c98aa063fc1d9d2ecd. Here's why: Actually... I just screwed this up. I merged this new fact into 2.4.x but it's not fixing any bug. It's adding a new fact, so this should go into master and we should release 2.5 since this is new, backwards-compatible functionality.
Diffstat (limited to 'lib/facter')
-rw-r--r--lib/facter/pe_version.rb53
1 files changed, 0 insertions, 53 deletions
diff --git a/lib/facter/pe_version.rb b/lib/facter/pe_version.rb
deleted file mode 100644
index 0cc0f64..0000000
--- a/lib/facter/pe_version.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# Fact: is_pe, pe_version, pe_major_version, pe_minor_version, pe_patch_version
-#
-# Purpose: Return various facts about the PE state of the system
-#
-# Resolution: Uses a regex match against puppetversion to determine whether the
-# machine has Puppet Enterprise installed, and what version (overall, major,
-# minor, patch) is installed.
-#
-# Caveats:
-#
-Facter.add("pe_version") do
- setcode do
- pe_ver = Facter.value("puppetversion").match(/Puppet Enterprise (\d+\.\d+\.\d+)/)
- pe_ver[1] if pe_ver
- end
-end
-
-Facter.add("is_pe") do
- setcode do
- if Facter.value(:pe_version).to_s.empty? then
- false
- else
- true
- end
- end
-end
-
-Facter.add("pe_major_version") do
- confine :is_pe => true
- setcode do
- if pe_version = Facter.value(:pe_version)
- pe_version.to_s.split('.')[0]
- end
- end
-end
-
-Facter.add("pe_minor_version") do
- confine :is_pe => true
- setcode do
- if pe_version = Facter.value(:pe_version)
- pe_version.to_s.split('.')[1]
- end
- end
-end
-
-Facter.add("pe_patch_version") do
- confine :is_pe => true
- setcode do
- if pe_version = Facter.value(:pe_version)
- pe_version.to_s.split('.')[2]
- end
- end
-end