commit bf1153a32d6f27291dd7a3238bc1a9451e9d6154
author Siobhan Tully <stully@verivue.com> Mon May 27 20:53:48 2013 -0400
committer Siobhan Tully <stully@verivue.com> Mon May 27 20:53:48 2013 -0400
tree 74e7c01151fe196a60694b87d36c7491221e4a2c
parent bca0b2be8ed74f17b1bf094b4a6ee52572ca11a4

Changed DeploymentNetwork to Deployment, adjusted initial_json to include service class json, modified admin screens to only show appropriate topLevel objects (with the exception of Key), added in showAll var to make it easier when developing to showAll the objects in Admin.  Removed Django_Evolution objects from admin interface.

planetstack/openstack/manager.py

diff --git a/planetstack/openstack/manager.py b/planetstack/openstack/manager.py
index b4697ce..4ddd7f6 100644
--- a/planetstack/openstack/manager.py
+++ b/planetstack/openstack/manager.py
@@ -1,5 +1,5 @@
 import os
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
+#os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
 import string
 import random
 
@@ -256,7 +256,7 @@
             if 'viccidev10' not in node.name:
                 nodes_dict[node.name] = node 
         
-        deployment = DeploymentNetwork.objects.filter(name='VICCI')[0]
+        deployment = Deployment.objects.filter(name='VICCI')[0]
         login_bases = ['princeton', 'stanford', 'gt', 'uw', 'mpisws']
         sites = Site.objects.filter(login_base__in=login_bases)
         # collect nova nodes: