[chef] Re: Re: Re: Re: Re: Chef at Airbnb

[Peter Donald < >]

Hi,

On Fri, Oct 18, 2013 at 10:17 AM, Igor Serebryany
<
 >
 wrote:
> the hard part is not splitting out a cookbook, the hard part is maintaining
> the code in two separate repos. i think you can do this with git patch and
> git apply, but it's not a familiar workflow.

We use braid [1] fairly successfully to do this.

# Merge the mycookbook to cookbooks/mycookbook
braid add git://github.com/mybiz/chef-mycookbook.git cookbooks/mycookbook

# Make some changes in aggregate cookbook
vi cookbooks/mycookbook/...
git commit -a -m "Mycookbook changes"

# Compare the local repo with the last import
braid diff cookbooks/mycookbook

# Update the local cookbook copy with the upstream changes
braid update cookbooks/mycookbook

You can also push changes directly from your local repo back to the
upstream but we tend to got through the generate a patch and go
through review/pull request system when merging back.

[1] https://github.com/realityforge/braid

-- 
Cheers,

Peter Donald