CHANGELOG.md

@@ -4,9 +4,21 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
-## [v2.2.0](https://github.com/camptocamp/puppet-systemd/tree/v2.2.0) (2019-02-11)
+## [v2.3.0](https://github.com/camptocamp/puppet-systemd/tree/v2.3.0) (2019-04-10)
 
-[Full Changelog](https://github.com/camptocamp/puppet-systemd/compare/2.1.0...v2.2.0)
+[Full Changelog](https://github.com/camptocamp/puppet-systemd/compare/2.2.0...v2.3.0)
+
+**Implemented enhancements:**
+
+- Add parameter to enable/disable the management of journald [\#99](https://github.com/camptocamp/puppet-systemd/pull/99) ([dhoppe](https://github.com/dhoppe))
+
+**Closed issues:**
+
+- Puppet version compatibility [\#34](https://github.com/camptocamp/puppet-systemd/issues/34)
+
+## [2.2.0](https://github.com/camptocamp/puppet-systemd/tree/2.2.0) (2019-02-25)
+
+[Full Changelog](https://github.com/camptocamp/puppet-systemd/compare/2.1.0...2.2.0)
 
 **Implemented enhancements:**
 
@@ -23,6 +35,7 @@ These should not affect the functionality of the module.
 
 **Merged pull requests:**
 
+- release 2.2.0 [\#97](https://github.com/camptocamp/puppet-systemd/pull/97) ([bastelfreak](https://github.com/bastelfreak))
 - Allow specifying owner/group/mode/show\_diff [\#94](https://github.com/camptocamp/puppet-systemd/pull/94) ([simondeziel](https://github.com/simondeziel))
 
 ## [2.1.0](https://github.com/camptocamp/puppet-systemd/tree/2.1.0) (2018-08-31)

data/common.yaml

@@ -21,4 +21,5 @@ systemd::fallback_ntp_server: ~
 systemd::manage_accounting: false
 systemd::accounting: {}
 systemd::purge_dropin_dirs: true
+systemd::manage_journald: true
 systemd::journald_settings: {}

manifests/init.pp

@@ -69,6 +69,9 @@
 #   as the fallback NTP servers. Any per-interface NTP servers obtained from
 #   systemd-networkd take precedence over this setting. requires puppetlabs-inifile
 #
+# @param manage_journald
+#   Manage the systemd journald
+#
 # @param journald_settings
 #   Config Hash that is used to configure settings in journald.conf
 #
@@ -95,6 +98,7 @@
   Boolean                                                $manage_accounting,
   Hash[String,String]                                    $accounting,
   Boolean                                                $purge_dropin_dirs,
+  Boolean                                                $manage_journald,
   Systemd::JournaldSettings                              $journald_settings,
 ){
 
@@ -118,5 +122,7 @@
     contain systemd::system
   }
 
-  contain systemd::journald
+  if $manage_journald {
+    contain systemd::journald
+  }
 }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "camptocamp-systemd",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "author": "camptocamp",
   "summary": "Puppet Systemd module",
   "license": "Apache-2.0",

spec/classes/init_spec.rb

@@ -161,9 +161,10 @@
           end
           it { is_expected.to compile.with_all_deps }
         end
-        context 'with journald options' do
+        context 'when enabling journald with options' do
           let(:params) do
             {
+              :manage_journald   => true,
               :journald_settings => {
                 'Storage'         => 'auto',
                 'MaxRetentionSec' => '5day',
@@ -197,6 +198,16 @@
             :ensure  => 'absent',
           )}
         end
+
+        context 'when disabling journald' do
+          let(:params) do
+            {
+              :manage_journald => false,
+            }
+          end
+          it { is_expected.to compile.with_all_deps }
+          it { is_expected.not_to contain_service('systemd-journald') }
+        end
       end
     end
   end