[openstack-dev] [fuel][puppet] Fuel Library and upstream modules
aschultz at mirantis.com
Thu Jul 30 14:22:10 UTC 2015
On Wed, Jul 29, 2015 at 5:16 PM, Emilien Macchi <emilien at redhat.com> wrote:
> This is a very good initiative and I'm happy to see that happening. It
> reflects what I was asking in our collaboration request.
> Though I have one suggestion for "Custom Upstream Module Changes" section.
> I suggest you:
> 1/ first submit the change in the upstream module
> 2/ cherry-pick the commit in Fuel custom branch
> 3/ keep track of upstream patch (address reviews, etc), and establish a
> sort of scoring to evaluate the debt  between downstream (Fuel) and
> upstream (OpenStack). It will make sure a maximum of code is upstream
> and downstream patches won't be forgotten.
> 4/ when an upstream patch is merged, drop the cherry-pick by rebasing.
Thanks, I have updated the page to reference using the cherry-pick option.
I think this sounds better than what was there previously.
> This is the workflow I try to push at Red Hat (in RDO) and to me, this
> is the way to go for having Puppet modules the closest as possible from
> upstream with the freedom to have custom patches downstream.
>  https://github.com/redhat-cip/debtor
> Emilien Macchi
> OpenStack Development Mailing List (not for usage questions)
> Unsubscribe: OpenStack-dev-request at lists.openstack.org?subject:unsubscribe
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the OpenStack-dev