lp:~vishvananda/nova/lp692317

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/nova/trunk at revision 484

Jesse Andrews (community): Approve on 2010-12-22

Ed Leafe (community): Approve on 2010-12-22

Devin Carlen (community): Approve on 2010-12-22

Jay Pipes (community): Needs Information on 2010-12-21

Diff: 61 lines (+16/-3)

2 files modified

nova/api/ec2/__init__.py (+7/-1)
nova/api/ec2/metadatarequesthandler.py (+9/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #692317: Metadata breaks with Forwarded-For

Low

Fix Released

Link a bug report

Related blueprints

471. By Vish Ishaya on 2010-12-22

merged trunk and fixed conflicts

470. By Vish Ishaya on 2010-12-19

Support proxying api by using X-Forwarded-For

469. By Jonathan Bryce on 2010-12-17

Removing unneeded Trial specific code

468. By Ed Leafe on 2010-12-17

Replaced the use of redis in fakeldap with a customized dict class. Auth unittests should now run fine without a redis server running, or without python-redis installed.

467. By Jonathan Bryce on 2010-12-17

Adding Ed Leafe to Authors file

466. By Josh Kearney on 2010-12-16

Put flags back in nova.virt.xenapi/vm_utils.

465. By termie on 2010-12-16

This branch removes most of the dependencies on twisted and moves towards the plan described by https://blueprints.launchpad.net/nova/+spec/unified-service-architecture

Tests are currently passing besides objectstore which is being skipped because it is heavily reliant on our twisted pieces, and I can run everything using the nova.sh

Additionally this adds nova-combined that covers everythign except for nova-objectstore, to test it what I've usually done is run nova.sh as usual

$ sudo ./eventlet_merge/contrib/nova.sh run ignored eventlet_merge

and then quit all the services except for nova-objectstore and then in one of the screens do

$ ./eventlet_merge/bin/nova-combined

And then run whatever manual testing you normally run.

Once objectstore has been deprecated and removed nova-combined can be expected to run the whole nova stack in a single process for testing and dev.

464. By Eldar Nugaev on 2010-12-15

Fix 688220
Added dependency on Twisted>=10.1.0 to pip-requires

463. By Soren Hansen on 2010-12-15

Make sure we properly close the bzr WorkingTree in our Authors up-to-datedness unit test.

462. By Vish Ishaya on 2010-12-15

The ppa was moved. This updates nova.sh to reflect that.