From 647b692d5bbde142b50204229f539a56e84a916a Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Thu, 31 Jan 2013 05:15:54 -0500 Subject: [PATCH] Only set selinux booleans if selinux is enabled Testing "selinux" facter fact https://bugzilla.redhat.com/show_bug.cgi?id=892942 Change-Id: I92d4183bb6fb4f6e031ebb1b005c6fa9469b6d59 --- packstack/puppet/templates/horizon.pp | 8 +++++--- packstack/puppet/templates/swift_builder.pp | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packstack/puppet/templates/horizon.pp b/packstack/puppet/templates/horizon.pp index 2ab43beda..4af865a7d 100644 --- a/packstack/puppet/templates/horizon.pp +++ b/packstack/puppet/templates/horizon.pp @@ -27,7 +27,9 @@ firewall { '001 horizon incoming': action => 'accept', } -selboolean{'httpd_can_network_connect': - value => on, - persistent => true, +if ($::selinux != "false"){ + selboolean{'httpd_can_network_connect': + value => on, + persistent => true, + } } diff --git a/packstack/puppet/templates/swift_builder.pp b/packstack/puppet/templates/swift_builder.pp index 95ae1049f..c5ea67fa8 100644 --- a/packstack/puppet/templates/swift_builder.pp +++ b/packstack/puppet/templates/swift_builder.pp @@ -22,7 +22,9 @@ firewall { '001 rsync incoming': action => 'accept', } -selboolean{'rsync_export_all_ro': - value => on, - persistent => true, +if ($::selinux != "false"){ + selboolean{'rsync_export_all_ro': + value => on, + persistent => true, + } }