diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c157ab13..53d1f2486 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,18 @@ configuration option. Chef Zero support for this new API is incomplete, so this setting cannot be used with Chef Zero until a future update to Chef Zero enables this functionality. +* `chef -v` now displays the version of the ChefDK, Chef, Berkshelf + and Test Kitchen. +* [#150](https://github.com/chef/chef-dk/pull/150) Update `generate repo` + command to no longer use monolithic repo. +* Updated dependencies (some bundled with the omnibus build) + * Chef - 12.2.0 + * chef-provisioning - 0.19 + * chef-provisioning-fog - 0.13.1 + * chef-provisioning-azure - 0.2.1 + * chef-provisioning-aws - 0.5.0 + * test-kitchen - 1.4.0 + * kitchen-vagrant - 0.17.0 # Last Release: 0.4.0 * Add support for uploading Policyfiles via native API rather than as a diff --git a/lib/chef-dk/cli.rb b/lib/chef-dk/cli.rb index 3c78c4f95..8ddeb17d2 100644 --- a/lib/chef-dk/cli.rb +++ b/lib/chef-dk/cli.rb @@ -23,6 +23,7 @@ require 'chef-dk/ui' require 'chef/util/path_helper' require 'chef/mixin/shell_out' +require 'bundler' module ChefDK class CLI diff --git a/lib/chef-dk/version.rb b/lib/chef-dk/version.rb index 272b8151b..3a27eb388 100644 --- a/lib/chef-dk/version.rb +++ b/lib/chef-dk/version.rb @@ -16,5 +16,5 @@ # module ChefDK - VERSION = "0.4.0" + VERSION = "0.5.0.rc.1" end diff --git a/lib/kitchen/provisioner/policyfile_zero.rb b/lib/kitchen/provisioner/policyfile_zero.rb index a4f0a80c1..e260df3c9 100644 --- a/lib/kitchen/provisioner/policyfile_zero.rb +++ b/lib/kitchen/provisioner/policyfile_zero.rb @@ -142,10 +142,11 @@ def prepare_validation_pem def prepare_client_rb data = default_config_rb.merge(config[:client_rb]) - # TODO this will need to be updated when chef-zero supports erchef paths (policy_group vs policies) data["use_policyfile"] = true data["versioned_cookbooks"] = true data["deployment_group"] = "#{policy_exporter.policy_name}-local" + # TODO this will need to be updated when chef-zero supports erchef paths (policy_group vs policies) + data["policy_document_native_api"] = false info("Preparing client.rb") debug("Creating client.rb from #{data.inspect}")