Merge lp:~sandy-walsh/nova/zones into lp:~hudson-openstack/nova/trunk
Proposed by
Sandy Walsh
Status: | Merged |
---|---|
Approved by: | Matt Dietz |
Approved revision: | 651 |
Merged at revision: | 696 |
Proposed branch: | lp:~sandy-walsh/nova/zones |
Merge into: | lp:~hudson-openstack/nova/trunk |
Diff against target: |
487 lines (+374/-9) 11 files modified
nova/api/openstack/__init__.py (+4/-0) nova/api/openstack/auth.py (+1/-0) nova/api/openstack/servers.py (+0/-2) nova/api/openstack/zones.py (+80/-0) nova/auth/novarc.template (+3/-4) nova/db/api.py (+28/-0) nova/db/sqlalchemy/api.py (+44/-0) nova/db/sqlalchemy/migrate_repo/versions/004_add_zone_tables.py (+61/-0) nova/db/sqlalchemy/migration.py (+2/-2) nova/db/sqlalchemy/models.py (+10/-1) nova/tests/api/openstack/test_zones.py (+141/-0) |
To merge this branch: | bzr merge lp:~sandy-walsh/nova/zones |
Related bugs: | |
Related blueprints: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matt Dietz (community) | Approve | ||
Eric Day (community) | Approve | ||
Jay Pipes (community) | Needs Fixing | ||
Review via email: mp+49730@code.launchpad.net |
Commit message
Added http://
Description of the change
This is the first phase of the multi-zone clustering. Right now it's just the API/DB stuff for adding/
Zones are just URL + username/password credentials of child zones.
python-novatools (on github) was also updated to support these changes.
Next we'll get these zones talking to each other.
To post a comment you must log in.
was the bin/nova-combined change accidental?