Merge lp:~ken-pepple/django-nova/lp710890 into lp:django-nova

Proposed by Ken Pepple
Status: Merged
Approved by: Devin Carlen
Approved revision: 13
Merged at revision: 13
Proposed branch: lp:~ken-pepple/django-nova/lp710890
Merge into: lp:django-nova
Diff against target: 12 lines (+1/-1)
1 file modified
src/django_nova/shortcuts.py (+1/-1)
To merge this branch: bzr merge lp:~ken-pepple/django-nova/lp710890
Reviewer Review Type Date Requested Status
Devin Carlen Approve
Review via email: mp+48051@code.launchpad.net

Description of the change

replaced hardcoded get_regions login with os settings

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

approve, and welcome to the project!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/django_nova/shortcuts.py'
--- src/django_nova/shortcuts.py 2011-01-21 22:38:42 +0000
+++ src/django_nova/shortcuts.py 2011-01-31 20:42:13 +0000
@@ -76,7 +76,7 @@
7676
77 if not regions:77 if not regions:
78 nova = get_nova_admin_connection()78 nova = get_nova_admin_connection()
79 conn = nova.connection_for('admin', 'admin')79 conn = nova.connection_for(settings.NOVA_ADMIN_USER, settings.NOVA_PROJECT)
80 results = conn.get_all_regions()80 results = conn.get_all_regions()
81 regions = [{'name': r.name, 'endpoint': r.endpoint} for r in results]81 regions = [{'name': r.name, 'endpoint': r.endpoint} for r in results]
82 cache.set('regions', regions, 60 * 60 * 24)82 cache.set('regions', regions, 60 * 60 * 24)

Subscribers

People subscribed via source and target branches

to status/vote changes: