diff --git a/manifests/config.pp b/manifests/config.pp index 53731098e..db5e98e2b 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -231,9 +231,10 @@ if $facts['systemd'] { # systemd fact provided by systemd module systemd::service_limits { "${service_name}.service": - limits => { 'LimitNOFILE' => $file_limit }, + selinux_ignore_defaults => ($facts['os']['family'] == 'RedHat'), + limits => { 'LimitNOFILE' => $file_limit }, # The service will be notified when config changes - restart_service => false, + restart_service => false, } } diff --git a/metadata.json b/metadata.json index 128ca4676..d7ca8e656 100644 --- a/metadata.json +++ b/metadata.json @@ -69,7 +69,7 @@ }, { "name": "camptocamp/systemd", - "version_requirement": ">= 2.1.0 < 3.0.0" + "version_requirement": ">= 2.10.0 < 3.0.0" } ], "tags": [ diff --git a/spec/classes/rabbitmq_spec.rb b/spec/classes/rabbitmq_spec.rb index 6bc1273a4..2e9d8548d 100644 --- a/spec/classes/rabbitmq_spec.rb +++ b/spec/classes/rabbitmq_spec.rb @@ -148,8 +148,11 @@ end if facts[:systemd] + selinux_ignore_defaults = facts[:os]['family'] == 'RedHat' + it do is_expected.to contain_systemd__service_limits("#{name}.service"). + with_selinux_ignore_defaults(selinux_ignore_defaults). with_limits('LimitNOFILE' => value). with_restart_service(false) end