lp:~ken-pepple/nova/dynamicinstancetypes

Branch merges

Propose for merging

No branches dependent on this one.

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

Devin Carlen (community): Approve on 2011-03-03

Josh Kearney (community): Approve on 2011-03-02

Diff: 1494 lines (+816/-252)

29 files modified

bin/nova-manage (+77/-1)
doc/.autogenerated (+80/-203)
doc/source/api/autoindex.rst (+6/-0)
doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.005_add_instance_metadata.rst (+6/-0)
doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.006_add_provider_data_to_volumes.rst (+6/-0)
doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.007_add_instance_types.rst (+6/-0)
doc/source/api/nova..tests.test_instance_types.rst (+6/-0)
doc/source/api/nova..tests.test_test.rst (+6/-0)
doc/source/api/nova..tests.test_utils.rst (+6/-0)
doc/source/man/novamanage.rst (+36/-0)
doc/source/nova.concepts.rst (+5/-0)
doc/source/runnova/managing.instance.types.rst (+84/-0)
nova/api/ec2/admin.py (+5/-6)
nova/api/openstack/__init__.py (+1/-0)
nova/api/openstack/flavors.py (+11/-9)
nova/compute/api.py (+3/-3)
nova/compute/instance_types.py (+107/-16)
nova/db/api.py (+35/-0)
nova/db/sqlalchemy/api.py (+92/-0)
nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py (+87/-0)
nova/db/sqlalchemy/models.py (+15/-1)
nova/tests/api/openstack/test_flavors.py (+7/-1)
nova/tests/db/fakes.py (+19/-2)
nova/tests/test_instance_types.py (+86/-0)
nova/tests/test_quota.py (+14/-3)
nova/tests/test_xenapi.py (+1/-1)
nova/virt/libvirt_conn.py (+4/-2)
nova/virt/xenapi/vm_utils.py (+4/-2)
plugins/xenserver/xenapi/etc/xapi.d/plugins/glance (+1/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #681411: Instance types should not be hard coded

Wishlist

Fix Released

Link a bug report

Related blueprints

699. By Ken Pepple on 2011-03-03

moved migration to 008 (sigh)

698. By Ken Pepple on 2011-03-03

merged trunk

697. By Ken Pepple on 2011-03-03

catching bare except:

696. By Ken Pepple on 2011-03-03

added logging to instance_types for DB errors per code review

695. By Ken Pepple on 2011-03-03

requested style change

694. By Ken Pepple on 2011-03-03

adding new source docs

693. By Ken Pepple on 2011-03-03

corrected error message

692. By Ken Pepple on 2011-03-03

changed _context

691. By Ken Pepple on 2011-03-03

pep8

690. By Ken Pepple on 2011-03-03

added in req.environ for context