[OpenStack-Infra] [kolla] making stable/mitaka == stable/liberty

2016-04-15 Thread Steven Dake (stdake)
Hey fellow OpenStackers,

Kolla 1.0.0 has a fatal flaw in its design related to data containers.  The 
details are outlined here:
http://docs.openstack.org/developer/kolla/liberty-deployment-warning.html

Our plan to rectify this involves taking what is in stable/mitaka and making it 
stable/liberty and placing 1-3 patches on top of stable/liberty to make it 
deploy the liberty version of openstack.  These 1-3 patches include metadata 
like repo locations, upstream tarball locations, etc.  No actual code.  This is 
a one time thing; in the future we will be following a strict bug-backport only 
policy.

Our options include:
1. make a megapatch diff of liberty vs mitaka and merge that, with a patch on 
top to fix the repos
Example here:
https://review.openstack.org/#/c/306625/

2. Tag the tip of stable/liberty with liberty-early-demise, delete the liberty 
branch, then create a new stable/liberty branch from the tip of stable/mitaka

3. Tag the tip of stable/liberty with liberty-early-demise, and run git reset 
-hard origin/stable/mitaka outside of gerrit.  Tonyb says our setup prevents 
non-fast-forwarded pushes so this might not be viable.

This was tonyb's work here:
http://paste.openstack.org/raw/494295/

What we want to avoid is jamming 1k+ patches through our CI system and having 
the core reviewers have to deal with acking all those patches, or overloading 
gerrit and breaking things there.

I am far from a git wizard, and don't really know the best way to proceed, 
other  than we must have a liberty 1.1.0 deliverable with our mitaka bits + 
liberty repo pointers.  I'd really like to preserve history.  What we need is 
for stable/liberty to be an exact duplicate of stable/mitaka codwise, while 
also preserving history (which option 1 doesn't do).

Can the Kolla community get an ack on the options from the Infrastructure team 
one way or another, so I can get the ball rolling on our end and sync up with 
Doug on the plan?

Thanks!
-steve

___
OpenStack-Infra mailing list
OpenStack-Infra@lists.openstack.org
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-infra


Re: [OpenStack-Infra] [kolla] making stable/mitaka == stable/liberty

2016-04-15 Thread Clark Boylan
On Fri, Apr 15, 2016, at 02:39 PM, Steven Dake (stdake) wrote:
> Hey fellow OpenStackers,
> 
> Kolla 1.0.0 has a fatal flaw in its design related to data containers. 
> The details are outlined here:
> http://docs.openstack.org/developer/kolla/liberty-deployment-warning.html
> 
> Our plan to rectify this involves taking what is in stable/mitaka and
> making it stable/liberty and placing 1-3 patches on top of stable/liberty
> to make it deploy the liberty version of openstack.  These 1-3 patches
> include metadata like repo locations, upstream tarball locations, etc. 
> No actual code.  This is a one time thing; in the future we will be
> following a strict bug-backport only policy.
> 
> Our options include:
> 1. make a megapatch diff of liberty vs mitaka and merge that, with a
> patch on top to fix the repos
> Example here:
> https://review.openstack.org/#/c/306625/
> 
> 2. Tag the tip of stable/liberty with liberty-early-demise, delete the
> liberty branch, then create a new stable/liberty branch from the tip of
> stable/mitaka
> 
> 3. Tag the tip of stable/liberty with liberty-early-demise, and run git
> reset -hard origin/stable/mitaka outside of gerrit.  Tonyb says our setup
> prevents non-fast-forwarded pushes so this might not be viable.
> 
> This was tonyb's work here:
> http://paste.openstack.org/raw/494295/
> 
> What we want to avoid is jamming 1k+ patches through our CI system and
> having the core reviewers have to deal with acking all those patches, or
> overloading gerrit and breaking things there.
> 
> I am far from a git wizard, and don't really know the best way to
> proceed, other  than we must have a liberty 1.1.0 deliverable with our
> mitaka bits + liberty repo pointers.  I'd really like to preserve
> history.  What we need is for stable/liberty to be an exact duplicate of
> stable/mitaka codwise, while also preserving history (which option 1
> doesn't do).
> 
> Can the Kolla community get an ack on the options from the Infrastructure
> team one way or another, so I can get the ball rolling on our end and
> sync up with Doug on the plan?

Is there some reason that the normal backport process used on all of the
other projects wouldn't work here? Backport the bug fixes you need from
the newer branches then release a 1.1.0.

Clark

___
OpenStack-Infra mailing list
OpenStack-Infra@lists.openstack.org
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-infra


Re: [OpenStack-Infra] Infra team summit sessions scheduled

2016-04-15 Thread Elizabeth K. Joseph
On Thu, Apr 14, 2016 at 9:19 PM, Jeremy Stanley  wrote:
> After much obsessing, I have our session schedule as finalized as I
> can. Here's the basic summary [in Austin-local CDT (UTC-05:00)]:
>
> Wednesday:
> 09:00-09:40 fishbowl "Community Task-Tracking" (MR 400)
> conflicts: ansible, refstack, docs
> 11:50-12:30 work session "Landing Page for Contributors" (MR 416A)
> conflicts: ironic, nova(ci), ansible, docs
> 13:50-14:30 work session "Launch-Node, Ansible and Puppet" (MR 416A)
> conflicts: ironic, oslo, puppet
> 15:30-16:10 fishbowl "Wiki Upgrades" (MR 400)
> conflicts: oslo, qa(ci)
>
> Thursday:
> 09:00-09:40 work session "Proposal Jobs" (MR 416A)
> conflicts: ansible, oslo, solum, neutron(mtu)
> 09:50-10:30 work session "Robustify Ansible-Puppet" (MR 416A)
> conflicts: ansible, defcore, docs(contrib guide)
> 11:00-11:40 fishbowl "OpenID/SSO for Community Systems" (MR 400)
> conflicts: ansible, oslo, docs
> 16:10-16:50 fishbowl "Distro Upgrade Plans" (MR 400)
> conflicts: osc, oslo, solum, tripleo
>
> Friday:
> Infra/QA sprints (MR 404 and elsewhere)
>
> You can also browse it at:
>
>  https://www.openstack.org/summit/austin-2016/summit-schedule/global-search?t=Infrastructure%3A
>  >
>
> I'll start putting together the linked Etherpads next week unless
> some of you beat me to it.

Thanks fungi! All of the Etherpads have now been created, I pretty
much just copied over data from the brainstorming Etherpad so we know
who the proposer/leader of each session. Please feel free to add other
details that may be valuable for us to browse before the summit (or,
you know, 5 minutes before the session as we're settling in ;)).

-- 
Elizabeth Krumbach Joseph || Lyz || pleia2

___
OpenStack-Infra mailing list
OpenStack-Infra@lists.openstack.org
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-infra