From 2bf540b78c28fd616f5e23cc1d16113f26e87761 Mon Sep 17 00:00:00 2001 From: Josh Clausman Date: Fri, 19 Feb 2016 07:37:32 -0500 Subject: [PATCH] fixed bug in cloudformation template preventing extra_json from being provided to chef cookbooks --- cloudformation/cfncluster.cfn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudformation/cfncluster.cfn.json b/cloudformation/cfncluster.cfn.json index 88a721083e..a7980cdaca 100644 --- a/cloudformation/cfncluster.cfn.json +++ b/cloudformation/cfncluster.cfn.json @@ -1952,7 +1952,7 @@ "command" : "touch /etc/chef/ohai/hints/ec2.json" }, "jq" : { - "command" : "/usr/local/bin/jq --argfile f1 /tmp/dna.json --argfile f2 /tmp/extra.json -n '$f1 + $f2 | .cfncluster = $f1.cfncluster + $f2.cfncluster' > /etc/chef/dna.json || echo \"jq not installed\"; cp /tmp/dna.json /etc/chef/dna.json" + "command" : "/usr/local/bin/jq --argfile f1 /tmp/dna.json --argfile f2 /tmp/extra.json -n '$f1 + $f2 | .cfncluster = $f1.cfncluster + $f2.cfncluster' > /etc/chef/dna.json || ( echo \"jq not installed\"; cp /tmp/dna.json /etc/chef/dna.json )" } } },