diff options
| -rw-r--r-- | data/params/RedHat/CentOS/6.6.yaml | 10 | ||||
| -rw-r--r-- | data/versions/3.6.1.yaml | 4 | ||||
| -rw-r--r-- | manifests/host.pp | 4 | ||||
| -rw-r--r-- | manifests/params.pp | 3 |
4 files changed, 19 insertions, 2 deletions
diff --git a/data/params/RedHat/CentOS/6.6.yaml b/data/params/RedHat/CentOS/6.6.yaml new file mode 100644 index 0000000..06b94f7 --- /dev/null +++ b/data/params/RedHat/CentOS/6.6.yaml @@ -0,0 +1,10 @@ +# gluster/data/params/RedHat/CentOS/6.6.yaml +--- +# looks like this may be irrelevant after all as CentOS 6.6 +# appears to accept system_u; however, it required a reboot for +# puppet to stop looping through modifying files on each iteration. +gluster::params::selinux_glusterd_seluser: 'system_u' + + + +# vim: ts=8
\ No newline at end of file diff --git a/data/versions/3.6.1.yaml b/data/versions/3.6.1.yaml new file mode 100644 index 0000000..02bef3c --- /dev/null +++ b/data/versions/3.6.1.yaml @@ -0,0 +1,4 @@ +# gluster/data/versions/3.6.1.yaml +--- +gluster::versions::operating_version: '30600' # v3.6.1 +# vim: ts=8 diff --git a/manifests/host.pp b/manifests/host.pp index c4d0f70..064588b 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -114,7 +114,7 @@ define gluster::host( group => root, mode => 600, # u=rw,go=r seltype => 'glusterd_var_lib_t', - seluser => 'system_u', + seluser => "${::gluster::params::selinux_glusterd_seluser}", ensure => present, notify => Service["${::gluster::params::service_glusterd}"], require => File['/var/lib/glusterd/'], @@ -200,7 +200,7 @@ define gluster::host( # NOTE: this mode was found by inspecting the process mode => 600, # u=rw,go=r seltype => 'glusterd_var_lib_t', - seluser => 'system_u', + seluser => "${::gluster::params::selinux_glusterd_seluser}", notify => [ # propagate the notify up File['/var/lib/glusterd/peers/'], diff --git a/manifests/params.pp b/manifests/params.pp index ce8ef4d..7b3f6bd 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -53,6 +53,9 @@ class gluster::params( $program_fping = '/usr/sbin/fping', $program_findmnt = '/bin/findmnt', + # SELinux + $selinux_glusterd_seluser = 'system_u', + # services... $service_glusterd = 'glusterd', |