Remove default "admin"/"admin" user/project credentials and replace with what is configured in settings.py

django-nova-syspanel/src/django_nova_syspanel/views/instances.py

@@ -1,5 +1,6 @@
 from django import template
 from django import http
+from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import render_to_response
 from django_nova_syspanel.models import *
@@ -20,7 +21,7 @@ def _reservations_to_instances(reservation_list):
 @login_required
 def index(request):
     nova = get_nova_admin_connection()
-    conn = nova.connection_for("admin", "admin")
+    conn = nova.connection_for(settings.NOVA_ADMIN_USER, settings.NOVA_PROJECT)
     reservations = conn.get_all_instances()    
     instances = _reservations_to_instances(reservations)
     return render_to_response('django_nova_syspanel/instances/index.html',{
@@ -30,7 +31,7 @@ def index(request):
 @login_required
 def terminate(request, instance_id):
     nova = get_nova_admin_connection()
-    conn = nova.connection_for("admin", "admin")
+    conn = nova.connection_for(settings.NOVA_ADMIN_USER, settings.NOVA_PROJECT)
     reservations = conn.get_all_instances()
     instances = _reservations_to_instances(reservations)
     try:
@@ -54,7 +55,7 @@ def terminate(request, instance_id):
 @login_required
 def console(request, instance_id):
     nova = get_nova_admin_connection()
-    conn = nova.connection_for("admin", "admin")
+    conn = nova.connection_for(settings.NOVA_ADMIN_USER, settings.NOVA_PROJECT)
     console = conn.get_console_output(instance_id)
     response = http.HttpResponse(mimetype='text/plain')
     response.write(console.output)
@@ -65,7 +66,7 @@ def console(request, instance_id):
 @login_required
 def restart(request, instance_id):
     nova = get_nova_admin_connection()
-    conn = nova.connection_for("admin", "admin")
+    conn = nova.connection_for(settings.NOVA_ADMIN_USER, settings.NOVA_PROJECT)
     try:
         conn.reboot_instances([instance_id])
         message = "Instance %s has been scheduled for reboot." % \

django-nova-syspanel/src/django_nova_syspanel/views/security.py

@@ -1,4 +1,5 @@
 from django import template
+from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import redirect, render_to_response
@@ -23,7 +24,7 @@ def disable_project_credentials(request):
         form = DisableProject(request.POST)
         if form.is_valid():
             name = form.cleaned_data['project_name']
-            conn = nova.connection_for(nova.access, name)
+            conn = nova.connection_for(settings.NOVA_ADMIN_USER, name)
             vpn = [x for x in nova.get_vpns() if x.project_id == name]
             if vpn:
                 # NOTE(todd): Check, because it could already be shut-off
@@ -89,7 +90,8 @@ def disable_public_ips(request):
 def disable_vpn(request):
     if request.method == "POST":
         nova = get_nova_admin_connection()
-        conn = nova.connection_for("admin", "admin")
+        conn = nova.connection_for(settings.NOVA_ADMIN_USER,
+                                   settings.NOVA_PROJECT)
         try:
             collector = []
             for vpn in nova.get_vpns():

django-nova-syspanel/src/django_nova_syspanel/views/volumes.py

@@ -1,5 +1,6 @@
 from boto.exception import EC2ResponseError
 from django import template
+from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import redirect, render_to_response
@@ -9,7 +10,7 @@ from django_nova_syspanel.models import *
 @login_required
 def index(request):
     nova = get_nova_admin_connection()
-    conn = nova.connection_for('admin', 'admin')
+    conn = nova.connection_for(settings.NOVA_ADMIN_USER, settings.NOVA_PROJECT)
     volumes = conn.get_all_volumes()
 
     for volume in volumes:
@@ -30,7 +31,7 @@ def index(request):
 @login_required
 def detach(request, volume_id):
     nova = get_nova_admin_connection()
-    conn = nova.connection_for('admin', 'admin')
+    conn = nova.connection_for(settings.NOVA_ADMIN_USER, settings.NOVA_PROJECT)
     try:
         conn.detach_volume(volume_id)
     except EC2ResponseError, e:
@@ -46,7 +47,7 @@ def detach(request, volume_id):
 @login_required
 def delete(request, volume_id):
     nova = get_nova_admin_connection()
-    conn = nova.connection_for('admin', 'admin')
+    conn = nova.connection_for(settings.NOVA_ADMIN_USER, settings.NOVA_PROJECT)
     try:
         conn.delete_volume(volume_id)
     except EC2ResponseError, e:

django-nova-syspanel/src/django_nova_syspanel/views/vpns.py

@@ -1,5 +1,6 @@
 from django import http
 from django import template
+from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import redirect, render_to_response
 from django_nova_syspanel.models import get_nova_admin_connection
@@ -17,7 +18,7 @@ def index(request):
 @login_required
 def console(request, project_id):
     nova = get_nova_admin_connection()
-    conn = nova.connection_for(nova.access, project_id)
+    conn = nova.connection_for(settings.NOVA_ADMIN_USER, project_id)
     vpn = [x for x in nova.get_vpns() if x.project_id == project_id][0]
     console = conn.get_console_output(vpn.instance_id)
     response = http.HttpResponse(mimetype='text/plain')
@@ -29,7 +30,7 @@ def console(request, project_id):
 @login_required
 def restart(request, project_id):
     nova = get_nova_admin_connection()
-    conn = nova.connection_for(nova.access, project_id)
+    conn = nova.connection_for(settings.NOVA_ADMIN_USER, project_id)
     vpn = [x for x in nova.get_vpns() if x.project_id == project_id][0]
     conn.reboot_instances([vpn.instance_id])
     return redirect('django_nova_syspanel/vpns')
@@ -38,7 +39,7 @@ def restart(request, project_id):
 @login_required
 def terminate(request, project_id):
     nova = get_nova_admin_connection()
-    conn = nova.connection_for(nova.access, project_id)
+    conn = nova.connection_for(settings.NOVA_ADMIN_USER, project_id)
     vpn = [x for x in nova.get_vpns() if x.project_id == project_id][0]
     conn.terminate_instances([vpn.instance_id])
     return redirect('django_nova_syspanel/vpns')