Merge pull request #550 from hunner/merge_535

Fix unit tests on #535
voxpupuli · Jun 22, 2017 · a542e56 · a542e56
2 parents 8967e2d + 79a261b
commit a542e56
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -132,6 +132,27 @@
 
   case $::osfamily {
     'Debian': {
+      if versioncmp($::operatingsystemmajrelease, '16.04') >= 0 {
+        file { '/etc/systemd/system/rabbitmq-server.service.d':
+          ensure                  => directory,
+          owner                   => '0',
+          group                   => '0',
+          mode                    => '0755',
+          selinux_ignore_defaults => true,
+        }
+        -> file { '/etc/systemd/system/rabbitmq-server.service.d/limits.conf':
+          content => template('rabbitmq/rabbitmq-server.service.d/limits.conf'),
+          owner   => '0',
+          group   => '0',
+          mode    => '0644',
+          notify  => Exec['rabbitmq-systemd-reload'],
+        }
+        exec { 'rabbitmq-systemd-reload':
+          command     => '/bin/systemctl daemon-reload',
+          notify      => Class['Rabbitmq::Service'],
+          refreshonly => true,
+        }
+      }
       file { '/etc/default/rabbitmq-server':
         ensure  => file,
         content => template('rabbitmq/default.erb'),

diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
@@ -10,11 +10,14 @@
 def with_debian_facts
   let :facts do
     super().merge({
-      :lsbdistcodename  => 'squeeze',
-      :lsbdistid        => 'Debian',
-      :osfamily         => 'Debian',
-      :os               => { :name => 'Debian',
-                             :release => { :full => '6.0'} },
+      :operatingsystemmajrelease => '6',
+      :lsbdistcodename           => 'squeeze',
+      :lsbdistid                 => 'Debian',
+      :osfamily                  => 'Debian',
+      :os                        => {
+        :name    => 'Debian',
+        :release => { :full => '6.0'},
+      },
     })
   end
 end