[Pkg-puppet-devel] [facter] 282/352: (FACT-346) Remove deprecated selinux_mode fact
Stig Sandbeck Mathisen
ssm at debian.org
Sun Apr 6 22:21:53 UTC 2014
This is an automated email from the git hooks/post-receive script.
ssm pushed a commit to branch master
in repository facter.
commit 790da64f3c04b6c59eb0aa9341be5f93456e164c
Author: Adrien Thebo <git at somethingsinistral.net>
Date: Mon Feb 24 08:14:59 2014 -0800
(FACT-346) Remove deprecated selinux_mode fact
See also https://projects.puppetlabs.com/issues/6677
---
lib/facter/selinux.rb | 11 -----------
spec/unit/selinux_spec.rb | 6 ------
2 files changed, 17 deletions(-)
diff --git a/lib/facter/selinux.rb b/lib/facter/selinux.rb
index 9599d96..1bbeeaa 100644
--- a/lib/facter/selinux.rb
+++ b/lib/facter/selinux.rb
@@ -97,14 +97,3 @@ Facter.add("selinux_config_policy") do
result.chomp
end
end
-
-# This is a legacy fact which returns the old selinux_mode fact value to prevent
-# breakages of existing manifests. It should be removed at the next major release.
-# See ticket #6677.
-
-Facter.add("selinux_mode") do
- confine :selinux => :true
- setcode do
- Facter.value(:selinux_config_policy)
- end
-end
diff --git a/spec/unit/selinux_spec.rb b/spec/unit/selinux_spec.rb
index 9241bec..49964b8 100755
--- a/spec/unit/selinux_spec.rb
+++ b/spec/unit/selinux_spec.rb
@@ -96,12 +96,6 @@ describe "SELinux facts" do
Facter.fact(:selinux_config_policy).value.should == "targeted"
end
-
- it "should ensure legacy selinux_mode facts returns same value as selinux_config_policy fact" do
- Facter.fact(:selinux_config_policy).stubs(:value).returns("targeted")
-
- Facter.fact(:selinux_mode).value.should == "targeted"
- end
end
def sestatus_is(status)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git
More information about the Pkg-puppet-devel
mailing list