Merge pull request #79 from dhollinger/rel400

Release 4.0.0

CHANGELOG.md

@@ -4,6 +4,18 @@ 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 impact the functionality of the module.
 
+## [v4.0.0](https://github.com/voxpupuli/puppet-autofs/tree/v4.0.0) (2017-09-13)
+[Full Changelog](https://github.com/voxpupuli/puppet-autofs/compare/v3.2.0...v4.0.0)
+
+**Implemented enhancements:**
+
+-  Fix spec test for autofs\_version fact [\#80](https://github.com/voxpupuli/puppet-autofs/pull/80) ([wyardley](https://github.com/wyardley))
+- BREAKING: refactor hiera data lookup [\#76](https://github.com/voxpupuli/puppet-autofs/pull/76) ([dhollinger](https://github.com/dhollinger))
+
+**Fixed bugs:**
+
+- Solaris support with tests [\#78](https://github.com/voxpupuli/puppet-autofs/pull/78) ([Nekototori](https://github.com/Nekototori))
+
 ## [v3.2.0](https://github.com/voxpupuli/puppet-autofs/tree/v3.2.0) (2017-07-02)
 [Full Changelog](https://github.com/voxpupuli/puppet-autofs/compare/v3.1.0...v3.2.0)
 
@@ -15,6 +27,10 @@ These should not impact the functionality of the module.
 
 - Not compatible with Puppet 5 [\#73](https://github.com/voxpupuli/puppet-autofs/issues/73)
 
+**Merged pull requests:**
+
+- Release 3.2.0 [\#75](https://github.com/voxpupuli/puppet-autofs/pull/75) ([dhollinger](https://github.com/dhollinger))
+
 ## [v3.1.0](https://github.com/voxpupuli/puppet-autofs/tree/v3.1.0) (2017-06-24)
 [Full Changelog](https://github.com/voxpupuli/puppet-autofs/compare/v3.0.2...v3.1.0)
 

docs/_index.html

@@ -141,7 +141,7 @@ <h2>File Listing</h2>
 </div>
 
       <div id="footer">
-  Generated on Sun Jul  2 12:09:02 2017 by
+  Generated on Wed Sep 13 10:22:53 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

docs/file.README.html

@@ -179,6 +179,29 @@ <h5>auto.home</h5>
     order: 01
 </code></pre>
 
+<p>If you need to merge the <code>autofs::mounts</code> key from multiple files or hiera lookups, be sure to add the <code>lookup_options</code>
+key and set the merge behavior for <code>autofs::mounts</code> to <code>merge: hash</code></p>
+
+<pre class="code yaml"><code class="yaml">lookup_options:
+  autofs::mounts:
+    merge: hash
+autofs::mounts:
+  home:
+    mount: &#39;/home&#39;
+    mapfile: &#39;/etc/auto.home&#39;
+    mapcontents:
+      - &#39;* -user,rw,soft,intr,rsize=32768,wsize=32768,tcp,nfsvers=3,noacl server.example.com:/path/to/home/shares&#39;
+    options: &#39;--timeout=120&#39;
+    order: 01
+</code></pre>
+
+<p>For more information about merge behavior see the doc for:</p>
+
+<ul>
+<li><a href="https://docs.puppet.com/puppet/4.7/lookup_quick.html#puppet-lookup:-quick-reference-for-hiera-users">Lookup docs</a> </li>
+<li><a href="https://docs.puppet.com/puppet/5.1/hiera_merging.html">Hiera 5 docs</a> if using Puppet &gt;= 4.9</li>
+</ul>
+
 <h5>Direct Map <code>/-</code> arugment</h5>
 
 <p>The autofs module also supports the use of the built in autofs <code>/-</code> argument used with Direct Maps.</p>
@@ -535,7 +558,7 @@ <h2>Authors</h2>
 </div></div>
 
       <div id="footer">
-  Generated on Sun Jul  2 12:09:02 2017 by
+  Generated on Wed Sep 13 10:22:53 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

docs/index.html

@@ -179,6 +179,29 @@ <h5>auto.home</h5>
     order: 01
 </code></pre>
 
+<p>If you need to merge the <code>autofs::mounts</code> key from multiple files or hiera lookups, be sure to add the <code>lookup_options</code>
+key and set the merge behavior for <code>autofs::mounts</code> to <code>merge: hash</code></p>
+
+<pre class="code yaml"><code class="yaml">lookup_options:
+  autofs::mounts:
+    merge: hash
+autofs::mounts:
+  home:
+    mount: &#39;/home&#39;
+    mapfile: &#39;/etc/auto.home&#39;
+    mapcontents:
+      - &#39;* -user,rw,soft,intr,rsize=32768,wsize=32768,tcp,nfsvers=3,noacl server.example.com:/path/to/home/shares&#39;
+    options: &#39;--timeout=120&#39;
+    order: 01
+</code></pre>
+
+<p>For more information about merge behavior see the doc for:</p>
+
+<ul>
+<li><a href="https://docs.puppet.com/puppet/4.7/lookup_quick.html#puppet-lookup:-quick-reference-for-hiera-users">Lookup docs</a> </li>
+<li><a href="https://docs.puppet.com/puppet/5.1/hiera_merging.html">Hiera 5 docs</a> if using Puppet &gt;= 4.9</li>
+</ul>
+
 <h5>Direct Map <code>/-</code> arugment</h5>
 
 <p>The autofs module also supports the use of the built in autofs <code>/-</code> argument used with Direct Maps.</p>
@@ -535,7 +558,7 @@ <h2>Authors</h2>
 </div></div>
 
       <div id="footer">
-  Generated on Sun Jul  2 12:09:02 2017 by
+  Generated on Wed Sep 13 10:22:53 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

docs/puppet_classes/autofs.html

@@ -138,10 +138,10 @@ <h2>Overview</h2>
         <span class='name'>mounts</span>
 
 
-        <span class='type'>(<tt>Optional[Hash]</tt>)</span>
+        <span class='type'>(<tt>Hash[String, Hash]</tt>)</span>
 
 
-        <em class="default">(defaults to: <tt>undef</tt>)</em>
+        <em class="default">(defaults to: <tt>{}</tt>)</em>
 
 
         &mdash;
@@ -155,10 +155,10 @@ <h2>Overview</h2>
         <span class='name'>maps</span>
 
 
-        <span class='type'>(<tt>Optional[Hash]</tt>)</span>
+        <span class='type'>(<tt>Hash[String, Hash]</tt>)</span>
 
 
-        <em class="default">(defaults to: <tt>undef</tt>)</em>
+        <em class="default">(defaults to: <tt>{}</tt>)</em>
 
 
         &mdash;
@@ -518,15 +518,14 @@ <h2>Overview</h2>
 92
 93
 94
-95
-96</pre>
+95</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/init.pp', line 76</span>
 
 class autofs (
-  Optional[Hash] $mounts                       = undef,
-  Optional[Hash] $maps                         = undef,
+  Hash[String, Hash] $mounts                   = {},
+  Hash[String, Hash] $maps                     = {},
   String $package_ensure                       = &#39;installed&#39;,
   Enum[ &#39;stopped&#39;, &#39;running&#39; ] $service_ensure = &#39;running&#39;,
   Boolean $service_enable                      = true,
@@ -536,13 +535,12 @@ <h2>Overview</h2>
     contain &#39;::autofs::service&#39;
   }
 
-  if $mounts {
-    $data = hiera_hash(&#39;autofs::mounts&#39;, $mounts)
-    create_resources(&#39;autofs::mount&#39;, $data)
+  $mounts.each |String $mount, Hash $attributes| {
+    autofs::mount { $mount: * =&gt; $attributes }
   }
-  if $maps {
-    $_datamaps = hiera_hash(&#39;autofs::maps&#39;, $maps)
-    create_resources(&#39;autofs::map&#39;,$_datamaps)
+
+  $maps.each |String $map, Hash $attributes| {
+    autofs::map { $map: * =&gt; $attributes }
   }
 }</pre>
       </td>
@@ -552,7 +550,7 @@ <h2>Overview</h2>
 </div>
 
       <div id="footer">
-  Generated on Sun Jul  2 12:09:02 2017 by
+  Generated on Wed Sep 13 10:22:53 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

docs/puppet_classes/autofs_3A_3Apackage.html

@@ -196,7 +196,7 @@ <h2>Overview</h2>
 </div>
 
       <div id="footer">
-  Generated on Sun Jul  2 12:09:02 2017 by
+  Generated on Wed Sep 13 10:22:53 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

docs/puppet_classes/autofs_3A_3Aservice.html

@@ -155,7 +155,7 @@ <h2>Overview</h2>
     enable     =&gt; $autofs::service_enable,
     hasstatus  =&gt; true,
     hasrestart =&gt; true,
-    require    =&gt; Package[&#39;autofs&#39;],
+    require    =&gt; Class[&#39;autofs::package&#39;],
   }
 }</pre>
       </td>
@@ -165,7 +165,7 @@ <h2>Overview</h2>
 </div>
 
       <div id="footer">
-  Generated on Sun Jul  2 12:09:02 2017 by
+  Generated on Wed Sep 13 10:22:53 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

docs/puppet_defined_types/autofs_3A_3Amap.html

@@ -270,8 +270,7 @@ <h2>Overview</h2>
 50
 51
 52
-53
-54</pre>
+53</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/map.pp', line 29</span>
@@ -284,14 +283,13 @@ <h2>Overview</h2>
   Boolean $replace                                                  = true,
   Integer $order                                                    = 1,
 ) {
-
   ensure_resource(concat,$mapfile,{
     ensure  =&gt; present,
     owner   =&gt; &#39;root&#39;,
     group   =&gt; &#39;root&#39;,
     mode    =&gt; $mapmode,
     replace =&gt; $replace,
-    require =&gt; Package[&#39;autofs&#39;],
+    require =&gt; Class[&#39;autofs::package&#39;],
     notify  =&gt; Service[&#39;autofs&#39;],
   })
 
@@ -309,7 +307,7 @@ <h2>Overview</h2>
 </div>
 
       <div id="footer">
-  Generated on Sun Jul  2 12:09:02 2017 by
+  Generated on Wed Sep 13 10:22:53 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

docs/puppet_defined_types/autofs_3A_3Amount.html

@@ -523,7 +523,7 @@ <h2>Overview</h2>
       &#39;owner&#39;   =&gt; &#39;root&#39;,
       &#39;group&#39;   =&gt; &#39;root&#39;,
       &#39;mode&#39;    =&gt; &#39;0755&#39;,
-      &#39;require&#39; =&gt; Package[&#39;autofs&#39;],
+      &#39;require&#39; =&gt; Class[&#39;autofs::package&#39;],
     })
 
     if !defined(Concat::Fragment[&#39;autofs::fragment preamble map directory&#39;]) {
@@ -563,7 +563,7 @@ <h2>Overview</h2>
 </div>
 
       <div id="footer">
-  Generated on Sun Jul  2 12:09:02 2017 by
+  Generated on Wed Sep 13 10:22:53 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

docs/top-level-namespace.html

@@ -90,7 +90,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sun Jul  2 12:09:02 2017 by
+  Generated on Wed Sep 13 10:22:53 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppet-autofs",
-  "version": "3.2.1-rc0",
+  "version": "4.0.0",
   "author": "Vox Pupuli",
   "summary": "Module for installing and managing autofs",
   "license": "Apache-2.0",