search

cfengine / design-center

CFEngine community-contributed content
http://cfengine.com/
Other
80 stars 68 forks source link

Merge demo policies from VMWorld2013 #365

Closed tzz closed 11 years ago

tzz commented 11 years ago

Needs to be reviewed and squashed, but should be fairly clean. @zzamboni @nickanderson WDYT?

zzamboni commented 11 years ago

Agreed should be merged. I can't review and squash now, please do it if you can, otherwise I'll get to it sometime next week. 

--Diego

On Fri, Aug 23, 2013 at 1:34 PM, Ted Zlatanov notifications@github.com wrote:

Needs to be reviewed and squashed, but should be fairly clean. @zzamboni @nickanderson WDYT? You can merge this Pull Request by running: git pull https://github.com/cfengine/design-center vmworld2013 Or you can view, comment on it, or merge it online at: https://github.com/cfengine/design-center/pull/365 -- Commit Summary --

  • New sketch Demo::SimpleApplication.
  • Regenerated cfsketches.json
  • Added OS dependency to Demo::SimpleApplication
  • Fixed syntax error.
  • Fixed namespace in stdlib calls
  • Fixed cross-bundle variable reference
  • autobalance: fix typoe
  • Merge branch 'vmworld2013' of github.com:cfengine/design-center into vmworld2013
  • regenerate cfsketches and READMEs
  • simpleapplication-deploy: new sketch
  • Tagged Demo::SimpleApplication::Deploy as enterprise_compatible
  • SimpleApplication::Deploy: added missing return parameter in call to ensure()
  • Allow disabling a deployment and use activation_id
  • Regenerated cfsketches.json
  • Remove activation_id from VM names, this needs to be redone properly later.
  • Unquote values as in original sketch.
  • Removed bundle name from parameter, it was causing an error
  • Fixed typo -- File Changes -- M sketches/applications/newrelic/README.md (6) M sketches/cfsketches.json (6) M sketches/cloud/autobalance/main.cf (20) M sketches/cloud/vmware/README.md (12) A sketches/demo/simpleapplication-deploy/README.md (24) A sketches/demo/simpleapplication-deploy/deploy.cf (88) A sketches/demo/simpleapplication-deploy/params/demo.json (6) A sketches/demo/simpleapplication-deploy/sketch.json (52) A sketches/demo/simpleapplication/README.md (22) A sketches/demo/simpleapplication/balance.cf (321) A sketches/demo/simpleapplication/sketch.json (49) M tools/test/Makefile (4) -- Patch Links -- https://github.com/cfengine/design-center/pull/365.patch https://github.com/cfengine/design-center/pull/365.diff
tzz commented 11 years ago

Squashed in #366