Merge pull request #63 from LM3CORP/master

pass hiera_config argument to puppet_apply
puppetlabs · Sep 11, 2018 · 46f9dd4 · 46f9dd4
2 parents 6f79b8e + ba3d4e3
commit 46f9dd4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/lib/beaker-puppet/helpers/puppet_helpers.rb b/lib/beaker-puppet/helpers/puppet_helpers.rb
@@ -434,6 +434,8 @@ def bounce_service host, service, curl_retries = nil, port = nil
         #                         path separator character. (The POSIX path separator
         #                         is ‘:’, and the Windows path separator is ‘;’.)
         #
+        # @option opts [String]   :hiera_config The path of the hiera.yaml configuration.
+        #
         # @option opts [String]   :debug (false) If this option exists,
         #                         the "--debug" command line parameter
         #                         will be passed to the 'puppet apply' command.
@@ -461,6 +463,7 @@ def apply_manifest_on(host, manifest, opts = {}, &block)
             puppet_apply_opts[:trace] = nil if opts[:trace]
             puppet_apply_opts[:parser] = 'future' if opts[:future_parser]
             puppet_apply_opts[:modulepath] = opts[:modulepath] if opts[:modulepath]
+            puppet_apply_opts[:hiera_config] = opts[:hiera_config] if opts[:hiera_config]
             puppet_apply_opts[:noop] = nil if opts[:noop]
 
             # From puppet help: