Open Stack

You mean contributing doc?  Sounds like a winner to me.  I am really concerned about how to sort out back ports as it relates to the repository split, and documenting a best practice here makes a lot of sense (once we figure out what that simple best practice is - which I think is covered in this thread).

Regards
-steve




On 11/17/16, 8:19 PM, "Jeffrey Zhang" <zhang.lei.fly at gmail.com> wrote:

>Yes. it works. Maybe we should add this into develop doc.
>
>thanks Paul.
>
>On Thu, Nov 17, 2016 at 11:00 PM, Paul Bourke <paul.bourke at oracle.com> wrote:
>> Seen as both repos stem from the same codebase, we should be able to just
>> cherry-pick changes as usual. If a fix comprises of a change to both kolla
>> and kolla-ansible, it will just mean two cherry-picks. Will need to wait
>> till the relevant pieces are removed from both repos to confirm this but I
>> think it will work.
>>
>> Here's an example using a recent change that just merged into kolla-ansible:
>>
>> git clone https://github.com/openstack/kolla
>> cd kolla
>> git remote add kolla-ansible https://github.com/openstack/kolla-ansible
>> git fetch kolla-ansible
>> git checkout stable/newton
>> git cherry-pick -x 43517f48f5ab2b9d8fb22dc2a619b8d9f4f494d0
>>
>> -Paul
>>
>>
>> On 17/11/16 14:02, Jeffrey Zhang wrote:
>>>
>>> We have split kolla repo into two repos. the dockerfile related code
>>> remains in kolla repo which builds images. and the ansible playbook
>>> related code is moved into kolla-ansible which deploy the images.
>>>
>>> But it brings a new challenge. How to backport the kolla-ansible
>>> change to kolla in stable branch? i.e. cross-repository backport.
>>>
>>> Does any guy have a solution for this case?
>>>
>>> --
>>> Regards,
>>> Jeffrey Zhang
>>> Blog: http://xcodest.me
>>>
>>> __________________________________________________________________________
>>> OpenStack Development Mailing List (not for usage questions)
>>> Unsubscribe: OpenStack-dev-request at lists.openstack.org?subject:unsubscribe
>>> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
>>>
>>
>> __________________________________________________________________________
>> OpenStack Development Mailing List (not for usage questions)
>> Unsubscribe: OpenStack-dev-request at lists.openstack.org?subject:unsubscribe
>> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
>
>
>
>-- 
>Regards,
>Jeffrey Zhang
>Blog: http://xcodest.me
>
>__________________________________________________________________________
>OpenStack Development Mailing List (not for usage questions)
>Unsubscribe: OpenStack-dev-request at lists.openstack.org?subject:unsubscribe
>http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev