Merge pull request #1424 from puppetlabs/release-prep

Release prep v9.6.0
puppetlabs · Apr 3, 2024 · 6027cd7 · 6027cd7
2 parents 5e4a66b + d4a95fd
commit 6027cd7
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v9.6.0](https://github.com/puppetlabs/puppetlabs-stdlib/tree/v9.6.0) - 2024-04-03
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-stdlib/compare/v9.5.0...v9.6.0)
+
+### Added
+
+- Allow usage of file templates with stdlib::manage [#1422](https://github.com/puppetlabs/puppetlabs-stdlib/pull/1422) ([tuxmea](https://github.com/tuxmea))
+
 ## [v9.5.0](https://github.com/puppetlabs/puppetlabs-stdlib/tree/v9.5.0) - 2024-03-11
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-stdlib/compare/v9.4.1...v9.5.0)

diff --git a/REFERENCE.md b/REFERENCE.md
@@ -266,20 +266,33 @@ and `subscribe`.
 
 ```puppet
 class { 'stdlib::manage':
-    'create_resources' => {
-      'file' => {
-        '/etc/motd.d/hello' => {
-          'content' => 'I say Hi',
-          'notify' => 'Service[sshd]',
+  'create_resources'      => {
+    'file'                => {
+      '/etc/motd.d/hello' => {
+        'content'         => 'I say Hi',
+        'notify'          => 'Service[sshd]',
+      },
+      '/etc/motd'         => {
+        'ensure'          => 'file',
+        'epp'             => {
+          'template'      => 'profile/motd.epp',
         }
       },
-      'package' => {
-        'example' => {
-          'ensure' => 'installed',
-          'subscribe' => ['Service[sshd]', 'Exec[something]'],
+      '/etc/information'  => {
+        'ensure'          => 'file',
+        'erb'             => {
+          'template'      => 'profile/informaiton.erb',
         }
       }
+    },
+    'package'             => {
+      'example'           => {
+        'ensure'          => 'installed',
+        'subscribe'       => ['Service[sshd]', 'Exec[something]'],
+      }
     }
+  }
+}
 ```
 
 ##### 
@@ -290,6 +303,15 @@ stdlib::manage::create_resources:
     '/etc/motd.d/hello':
       content: I say Hi
       notify: 'Service[sshd]'
+    '/etc/motd':
+      ensure: 'file'
+      epp:
+        template: 'profile/motd.epp'
+        context: {}
+    '/etc/information':
+      ensure: 'file'
+      erb:
+        template: 'profile/information.erb'
   package:
     example:
       ensure: installed
@@ -309,7 +331,8 @@ The following parameters are available in the `stdlib::manage` class:
 Data type: `Hash[String, Hash]`
 
 A hash of resources to create
-NOTE: functions, such as `template` or `epp`, are not evaluated.
+NOTE: functions, such as `template` or `epp`, are not directly evaluated
+      but processed as Puppet code based on epp and erb hash keys.
 
 Default value: `{}`
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-stdlib",
-  "version": "9.5.0",
+  "version": "9.6.0",
   "author": "puppetlabs",
   "summary": "Standard library of resources for Puppet modules.",
   "license": "Apache-2.0",