kitchen-puppet 1.47.4 → 1.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd46c32e4becafc637420cc03535bb3659fda372
-  data.tar.gz: 2a1d3a3bfbc3fee0e5266f84b9e31f881df8d3b1
+  metadata.gz: 942ab91b20ef7cd39f819db78b5f6beb9f7a6bd5
+  data.tar.gz: 6f214a9565ccf1b9db8508d939971b63dafb2097
 SHA512:
-  metadata.gz: ca129ce3c76fe3f4224ff8b3bfd51ad3736d76f150a2d21aece84ae21e1cf4df026fa115cd79b2788aabf12739980a86967e570ceee0671ddd0a93e370a0df9b
-  data.tar.gz: 75f93ad8af5526438b751dddb9f11ae9b1f5370cf4af6d704fc93ec203103e0967a10a7c44c7d8ea39e610bc6ddb3d9766edfb60cb6f91b784549392ed11c5c5
+  metadata.gz: 835b2f4473b1531a4a841abc509be2c411afe12c5b168b157a4f4eb62eaacd1bef813497f682db440d054a96c4b679a9e1b310fac631adf92000a9e0d5c4d0d2
+  data.tar.gz: 99cbab9178d8b3a63aa10522431bd1c7a9691bc0dadd78466a0ff5bfa8701734905d03acfe61a389b5de4d528b472c1ef9edf20b612abb527e715ff8abecadd0

data/README.md

@@ -188,8 +188,60 @@ suites:
       - modules/mycompany_base/spec/acceptance/base_spec.rb
 ```
 
-See [busser-beaker](https://github.com/neillturner/kitchen-verifier-serverspec)
+See [kitchen-verifier-serverspec](https://github.com/neillturner/kitchen-verifier-serverspec)
 
+## hiera_writer_files option
+
+Allows creation of arbitrary YAML files in the target instance's `hieradata/`
+dir in test-kitchen configuration (eg `kitchen.yml`). Like setting chef
+attributes in `kitchen.yml`, except for Hiera YAML files.
+
+set `hiera_writer_files` in `kitchen.yml`
+
+```
+---
+driver:
+  name: vagrant
+
+provisioner:
+  #name: puppet_apply
+  name: puppet_hierawriter_apply
+  manifests_path: /repository/puppet_repo/manifests
+  modules_path: /repository/puppet_repo/modules-mycompany
+  hiera_data_path: /repository/puppet_repo/hieradata
+  hiera_writer_files:
+    - datacenter/vagrant.yaml:
+      logstash_servers: []
+      hosts:
+        10.1.2.3:
+        - puppet
+        - puppetdb
+
+platforms:
+- name: nocm_ubuntu-12.04
+  driver_plugin: vagrant
+  driver_config:
+    box: nocm_ubuntu-12.04
+    box_url: http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
+
+suites:
+ - name: default
+```
+
+The above configuration will result in the creation of a file on the guest named
+`${hieradata}/datacenter/vagrant.yaml` containing:
+
+```
+---
+logstash_servers: []
+  hosts:
+    10.1.2.3:
+    - puppet
+    - puppetdb
+```
+
+It will overwrite any existing Hiera YAML files with the same name (on the
+guest), not merge.
 
 ## Provisioner Options
 Please see the Provisioner Options (https://github.com/neillturner/kitchen-puppet/blob/master/provisioner_options.md).

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '1.47.4'.freeze
+    VERSION = '1.48.0'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -54,6 +54,7 @@ module Kitchen
       default_config :hiera_version, nil
       default_config :install_hiera, false
       default_config :hiera_package, 'hiera-puppet'
+      default_config :hiera_writer_files, nil
       default_config :require_puppet_repo, true
       default_config :require_chef_for_busser, true
       default_config :resolve_with_librarian_puppet, true
@@ -790,6 +791,10 @@ module Kitchen
         powershell? ? 'C:/ProgramData/PuppetLabs/hiera/var' : '/var/lib/hiera'
       end
 
+      def hiera_writer
+        config[:hiera_writer_files]
+      end
+
       def hiera_eyaml
         config[:hiera_eyaml]
       end
@@ -1268,6 +1273,19 @@ module Kitchen
         debug("Copying hiera data from #{hiera_data} to #{tmp_hiera_dir}")
         FileUtils.mkdir_p(tmp_hiera_dir)
         FileUtils.cp_r(Dir.glob("#{hiera_data}/*"), tmp_hiera_dir)
+        if hiera_writer
+          hiera_writer.each do |file|
+            file.each do |filename, hiera_hash|
+              debug("Creating hiera yaml file #{tmp_hiera_dir}/#{filename}")
+              dir = File.join(tmp_hiera_dir, File.dirname(filename.to_s))
+              FileUtils.mkdir_p(dir)
+              output_file = open(File.join(dir, File.basename(filename.to_s)), 'w')
+              # convert json and back before converting to yaml to recursively convert symbols to strings, heh
+              output_file.write JSON[hiera_hash.to_json].to_yaml
+              output_file.close
+            end
+          end
+        end
         return unless hiera_eyaml_key_path
         tmp_hiera_key_dir = File.join(sandbox_path, 'hiera_keys')
         debug("Copying hiera eyaml keys from #{hiera_eyaml_key_path} to #{tmp_hiera_key_dir}")

data/provisioner_options.md

@@ -51,6 +51,7 @@ hiera_eyaml_key_remote_path | "/etc/puppet/secure/keys" | directory of hiera-eya
 hiera_eyaml_key_path  | "hiera_keys" | directory of hiera-eyaml keys on workstation
 hiera_package | 'hiera-puppet' | Only used if `install_hiera` is set
 hiera_version | "latest"| desired version, affects apt installs.
+hiera_writer_files | | Adds hiera YAML file generation
 http_proxy | nil | use http proxy when installing puppet, packages and running puppet
 https_proxy | nil | use https proxy when installing puppet, packages and running puppet
 ignored_paths_from_root | ['spec'] | allow extra paths to be ignored when copying from puppet repository
@@ -62,17 +63,17 @@ manifest | 'site.pp' | manifest for puppet apply to run
 manifests_path | | puppet repo manifests directory
 max_retries| 1 | maximum number of retry attempts of converge command
 modules_path | | puppet repo manifests directory. Can be multiple directories separated by colons and then they will be merged
-no_proxy | nil | list of URLs or IPs that should be excluded from proxying 
+no_proxy | nil | list of URLs or IPs that should be excluded from proxying
 platform | platform_name kitchen.yml parameter | OS platform of server
 puppet_apply_command | nil | Overwrite the puppet apply command. Needs "sudo -E puppet apply" as a prefix.
 puppet_apt_repo | "http://apt.puppetlabs.com/puppetlabs-release-precise.deb"| apt repo Ubuntu12 see https://apt.puppetlabs.com for others
-_for Ubuntu14 change to_ |	"http://apt.puppetlabs.com/puppetlabs-release-trusty.deb" |
+_for Ubuntu14 change to_ |      "http://apt.puppetlabs.com/puppetlabs-release-trusty.deb" |
 _for Ubuntu15 change to_ | "http://apt.puppetlabs.com/puppetlabs-release-jessie.deb" |
-_for Ubuntu16.04 change to_ |	"http://apt.puppetlabs.com/puppetlabs-release-xenial.deb" |
+_for Ubuntu16.04 change to_ |   "http://apt.puppetlabs.com/puppetlabs-release-xenial.deb" |
 puppet_apt_collections_repo | "http://apt.puppetlabs.com/puppetlabs-release-pc1-wheezy.deb" | apt collections repo
-_for Ubuntu14 change to_ |	"http://apt.puppetlabs.com/puppetlabs-release-pc1-trusty.deb" |
+_for Ubuntu14 change to_ |      "http://apt.puppetlabs.com/puppetlabs-release-pc1-trusty.deb" |
 _for Ubuntu15 change to_ | "http://apt.puppetlabs.com/puppetlabs-release-pc1-jessie.deb" |
-_for Ubuntu16.04 change to_ |	"http://apt.puppetlabs.com/puppetlabs-release-pc1-xenial.deb" |
+_for Ubuntu16.04 change to_ |   "http://apt.puppetlabs.com/puppetlabs-release-pc1-xenial.deb" |
 puppet_coll_remote_path | "/opt/puppetlabs" | Server Installation location of a puppet collections install.
 puppet_config_path | | path of custom puppet.conf file
 puppet_debug| false| Enable full debugging logging on puppet run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 1.47.4
+  version: 1.48.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen