lp:~sandy-walsh/nova/v1_1_novaclient

Branch merges

Propose for merging

No branches dependent on this one.

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

Ed Leafe (community): Approve on 2011-08-08

Josh Kearney (community): Approve on 2011-08-08

Diff: 243 lines (+29/-24)

11 files modified

nova/api/openstack/common.py (+1/-1)
nova/api/openstack/zones.py (+1/-1)
nova/auth/novarc.template (+1/-0)
nova/db/sqlalchemy/api.py (+1/-1)
nova/flags.py (+1/-1)
nova/scheduler/api.py (+7/-6)
nova/scheduler/zone_aware_scheduler.py (+5/-4)
nova/scheduler/zone_manager.py (+4/-3)
nova/tests/scheduler/test_scheduler.py (+7/-5)
nova/tests/test_zones.py (+0/-1)
tools/pip-requires (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #821044: Zones no longer work with novaclient 2.6.0

Undecided

Fix Released

Link a bug report

Related blueprints

1377. By Sandy Walsh on 2011-08-08

another trunk merge

1376. By Sandy Walsh on 2011-08-05

pep8 violations sneaking into trunk?

1375. By Sandy Walsh on 2011-08-05

pep8 violations sneaking into trunk?

1374. By Sandy Walsh on 2011-08-05

trunk merge

1373. By Sandy Walsh on 2011-08-05

fixed up zones controller to properly work with 1.1

1372. By Sandy Walsh on 2011-08-04

OS v1.1 is now the default into novarc

1371. By Sandy Walsh on 2011-08-04

added NOVA_VERSION to novarc

1370. By Sandy Walsh on 2011-08-04

uses 2.6.0 novaclient (OS API 1.1 support)

1369. By Johannes Erdfelt on 2011-08-04

The logic for confirming and reverting resizes was flipped. As a result, reverting a resize would end up deleting the source (instead of the destination) instance, and confirming would end up deleting the destination (instead of the source) instance.

This branch fixes the logic to be correct.

1368. By Ed Leafe on 2011-08-04

Found a case where an UnboundLocalError would be raised in xenapi_conn.py's wait_for_task() method. This fixes the problem by moving the definition of the unbound name outside of the conditional.