Skip to content

Commit

Permalink
Merge pull request #15 from mengesb/chef_backend_version
Browse files Browse the repository at this point in the history
Fix chef-backend version default
  • Loading branch information
mengesb authored Aug 10, 2016
2 parents cd28353 + d047104 commit 6282385
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ tf_hachef CHANGELOG

This file is used to list changes made in each version of the tf_hachef Terraform plan.

v0.2.4 (2016-08-10)
-------------------
- Fix for #14

v0.2.3 (2016-08-10)
-------------------
- Breakup `chef` map into `chef_backend`, `chef_client`, `chef_mlsa`,
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ to delete the resources.
* `tags_desc`: Default tag for ELB. Default: `Created using Terraform`
* `chef_backend`: Chef backend settings
* `count`: Count of chef-backend instances to deploy. Default: `4`
* `version`: Chef backend version to install. Default: `1.0.9`
* `version`: Chef backend version to install. Default: `1.1.2`
* `chef_client`: Chef client version to install. Default: `12.12.15`
* `chef_mlsa`: Indicate acceptance of the Chef MLSA. Must update to `true`. Default: `false`
* `chef_org`: Chef organization settings
Expand Down
2 changes: 1 addition & 1 deletion terraform.tfvars.example
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ ssl_certificate = {
#
#chef_backend = {
# count = 4
# version = "1.1.12"
# version = "1.1.2"
#}
#chef_client = "12.12.15"
chef_mlsa = "false" # Must update this to true!
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ variable "chef_backend" {
description = "Chef backend settings"
default = {
count = 4
version = "1.1.12"
version = "1.1.2"
}
}
variable "chef_server" {
Expand Down

0 comments on commit 6282385

Please sign in to comment.