← Back to branch summary

~devcamcar/horizon/trunk

« back to all changes in this revision

Viewing changes to django-nova-syspanel/src/django_nova_syspanel/views/instances.py

  • Committer: Tarmac
  • Author(s): Todd Willey
  • Date: 2011-05-02 18:33:29 UTC
  • mfrom: (41.1.1 trunk)
  • Revision ID: tarmac-20110502183329-zw8wfyznqurmid9l
Remove default "admin"/"admin" user/project credentials and replace with what is configured in settings.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
django-nova-syspanel/src/django_nova_syspanel/views/instances.py
1
1
from django import template
2
2
from django import http
 
3
from django.conf import settings
3
4
from django.contrib.auth.decorators import login_required
4
5
from django.shortcuts import render_to_response
5
6
from django_nova_syspanel.models import *
20
21
@login_required
21
22
def index(request):
22
23
    nova = get_nova_admin_connection()
23
 
    conn = nova.connection_for("admin", "admin")
 
24
    conn = nova.connection_for(settings.NOVA_ADMIN_USER, settings.NOVA_PROJECT)
24
25
    reservations = conn.get_all_instances()    
25
26
    instances = _reservations_to_instances(reservations)
26
27
    return render_to_response('django_nova_syspanel/instances/index.html',{
30
31
@login_required
31
32
def terminate(request, instance_id):
32
33
    nova = get_nova_admin_connection()
33
 
    conn = nova.connection_for("admin", "admin")
 
34
    conn = nova.connection_for(settings.NOVA_ADMIN_USER, settings.NOVA_PROJECT)
34
35
    reservations = conn.get_all_instances()
35
36
    instances = _reservations_to_instances(reservations)
36
37
    try:
54
55
@login_required
55
56
def console(request, instance_id):
56
57
    nova = get_nova_admin_connection()
57
 
    conn = nova.connection_for("admin", "admin")
 
58
    conn = nova.connection_for(settings.NOVA_ADMIN_USER, settings.NOVA_PROJECT)
58
59
    console = conn.get_console_output(instance_id)
59
60
    response = http.HttpResponse(mimetype='text/plain')
60
61
    response.write(console.output)
65
66
@login_required
66
67
def restart(request, instance_id):
67
68
    nova = get_nova_admin_connection()
68
 
    conn = nova.connection_for("admin", "admin")
 
69
    conn = nova.connection_for(settings.NOVA_ADMIN_USER, settings.NOVA_PROJECT)
69
70
    try:
70
71
        conn.reboot_instances([instance_id])
71
72
        message = "Instance %s has been scheduled for reboot." % \