fixed bug in cloudformation template preventing extra_json from being provided to chef cookbooks

clausman · clausman · commit 2bf540b78c28 · 2016-02-19T07:37:32.000-05:00
diff --git 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 )"
               }
             }
           },

Original file line number	Diff line number	Diff line change
`@@ -1952,7 +1952,7 @@`
`1952`	`1952`	`"command" : "touch /etc/chef/ohai/hints/ec2.json"`
`1953`	`1953`	`},`
`1954`	`1954`	`"jq" : {`
`1955`		`- "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"`
	`1955`	`+ "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 )"`
`1956`	`1956`	`}`
`1957`	`1957`	`}`
`1958`	`1958`	`},`