openstack/puppet-swift
Code Issues Proposed changes

Fix path for restorecon

Browse Source 
On RHEL6 restorecon is in /sbin and on newer RHEL based systems it is in /usr/sbin

Closes-Bug: rhbz#1109079
Change-Id: I5662c4337ff23310c12a86834c51c6a3ec151a1f
This commit is contained in:
Lukas Bezdicka
2014-06-13 13:42:02 +02:00
parent 6d35b1e8cf
commit c6e0dff2b4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/storage/mount.pp
View File

@@ -65,7 +65,7 @@ define swift::storage::mount(
if ($::selinux == 'true') {
exec { "restorecon_mount_${name}":
command => "restorecon ${mnt_base_dir}/${name}",
path => ['/usr/sbin', '/bin'],
path => ['/usr/sbin', '/sbin'],
subscribe => Exec["mount_${name}"],
before => Exec["fix_mount_permissions_${name}"],
refreshonly => true,

2
spec/defines/swift_storage_mount_spec.rb
View File

@@ -54,7 +54,7 @@ describe 'swift::storage::mount' do
it { should contain_exec("restorecon_mount_dans_mount_point").with(
{:command => "restorecon /srv/node/dans_mount_point",
:path => ['/usr/sbin', '/bin'],
:path => ['/usr/sbin', '/sbin'],
:refreshonly => true}
)}