keys and users work when openstack is disabled or unavailable

[plstackapi.git] / plstackapi / core / admin.py

diff --git a/plstackapi/core/admin.py b/plstackapi/core/admin.py
index 4bb9a98..58f5f58 100644 (file)
--- a/plstackapi/core/admin.py
+++ b/plstackapi/core/admin.py
@@ -63,25 +63,7 @@ class PlanetStackBaseAdmin(admin.ModelAdmin):
     save_on_top = False
 
 class OSModelAdmin(PlanetStackBaseAdmin):
-    """Attach client connection to openstack on delete() and save()""" 
-
-    def save_model(self, request, obj, form, change):
-        client = OpenStackClient(tenant=request.user.site.login_base, **request.session.get('auth', {}))
-        obj.driver = OpenStackDriver(client=client)
-        obj.caller = request.user
-        obj.save()
-
-    def delete_model(self, request, obj):
-        client = OpenStackClient(tenant=request.user.site.login_base, **request.session.get('auth', {}))
-        obj.driver = OpenStackDriver(client=client)
-        obj.caller = request.user
-        obj.delete()
-
-class RoleAdmin(PlanetStackBaseAdmin):
-    fieldsets = [
-        ('Role', {'fields': ['role_type']})
-    ]
-    list_display = ('role_type',)
+    """Attach client connection to openstack on delete() and save()"""
 
     def save_model(self, request, obj, form, change):
         auth = request.session.get('auth', {})
@@ -93,7 +75,14 @@ class RoleAdmin(PlanetStackBaseAdmin):
         auth = request.session.get('auth', {})
         auth['tenant'] = request.user.site.login_base
         obj.os_manager = OpenStackManager(auth=auth, caller=request.user)
-        obj.delete()
+        obj.delete() 
+
+class RoleAdmin(OSModelAdmin):
+    fieldsets = [
+        ('Role', {'fields': ['role_type']})
+    ]
+    list_display = ('role_type',)
+
 
 class DeploymentNetworkAdminForm(forms.ModelForm):
     sites = forms.ModelMultipleChoiceField(