v0.7.2

* add the custom attribute json override, so we can pass in dynamic bits of information to chef
albumprinter · Jul 12, 2017 · ad628de · ad628de
1 parent 7a33427
commit ad628de
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
+## [0.7.2] - 2017-07-12
+### Added
+- Added custom json parameter to the cluster ec2 instance chef provisioner
+
 ## [0.7.1] - 2017-07-12
 ### Changed
 - Added Readme with information and samples in the cluster module
@@ -217,7 +222,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Initial commit
 
-[Unreleased]: https://github.com/albumprinter/eops_tf_modules/compare/v0.7.1..HEAD
+[Unreleased]: https://github.com/albumprinter/eops_tf_modules/compare/v0.7.2..HEAD
+[0.7.2]: https://github.com/albumprinter/eops_tf_modules/compare/v0.7.1...v0.7.2
 [0.7.1]: https://github.com/albumprinter/eops_tf_modules/compare/v0.7.0...v0.7.1
 [0.7.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.6.6...v0.7.0
 [0.6.6]: https://github.com/albumprinter/eops_tf_modules/compare/v0.6.5...v0.6.6
@@ -229,6 +235,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [0.6.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.5.0...v0.6.0
 [0.5.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.3.0...v0.4.0
-[0.3.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.2.1...v0.3.0
+[0.3.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.0.1...v0.1.0
diff --git a/apps/cluster/README.md b/apps/cluster/README.md
@@ -26,5 +26,6 @@ module "consul-cluster" {
     lb_protocol_outside = "http" //LB listening protocol
     instance_port_inside = "8500" //application port to instances
     instance_protocol_inside = "http" //LB application protocol to instances
+    chef_attributes_json = "{}" //Attribute overrides for the chef recipe
 }
 ```
diff --git a/apps/cluster/ec2.tf b/apps/cluster/ec2.tf
@@ -35,6 +35,7 @@ resource "aws_instance" "app" {
     user_name       = "${var.tags_team}"
     user_key        = "${file("${var.user_keypath}")}"
     version         = "${var.chef_client_version}"
+    attributes_json = "${var.chef_attributes_json}"
 
     fetch_chef_certificates = true
     connection {

diff --git a/apps/cluster/variables.tf b/apps/cluster/variables.tf
@@ -153,3 +153,11 @@ variable "elb_sg_ingress_protocol" {
 variable "elb_healthcheck_target"  {
   default = "TCP:22"
 }
+
+variable "chef_attributes_json"  {
+  default = <<-EOF
+  {
+    "key": "value"
+  }
+  EOF
+}