fixed bug in cloudformation template for computefleet and extra_json

clausman · clausman · commit 53d374baba16 · 2016-02-19T15:19:36.000-05:00
diff --git a/cloudformation/cfncluster.cfn.json b/cloudformation/cfncluster.cfn.json
@@ -2613,7 +2613,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
`@@ -2613,7 +2613,7 @@`
`2613`	`2613`	`"command" : "touch /etc/chef/ohai/hints/ec2.json"`
`2614`	`2614`	`},`
`2615`	`2615`	`"jq" : {`
`2616`		`- "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"`
	`2616`	`+ "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 )"`
`2617`	`2617`	`}`
`2618`	`2618`	`}`
`2619`	`2619`	`},`