Change default resource limits

diff --git a/snf-astakos-app/astakos/im/migrations/0030_populate_resource_data.py b/snf-astakos-app/astakos/im/migrations/0030_populate_resource_data.py
index 439fdcd..be4d738 100644 (file)
--- a/snf-astakos-app/astakos/im/migrations/0030_populate_resource_data.py
+++ b/snf-astakos-app/astakos/im/migrations/0030_populate_resource_data.py
@@ -38,14 +38,14 @@ class Migration(DataMigration):
                 except Exception, e:
                     print "Cannot create resource ", rn
                     continue
-
-                q, created = orm.AstakosGroupQuota.objects.get_or_create(
-                    group=default,
-                    resource=r,
-                    defaults={
-                        'uplimit':uplimit,
-                    }
-                )
+                else:
+                    q, created = orm.AstakosGroupQuota.objects.get_or_create(
+                        group=default,
+                        resource=r,
+                        defaults={
+                            'uplimit':uplimit,
+                        }
+                    )
         map(create_policies, SERVICES.iteritems())
 
     def backwards(self, orm):

diff --git a/snf-astakos-app/astakos/im/settings.py b/snf-astakos-app/astakos/im/settings.py
index 44d08c7..86787e1 100644 (file)
--- a/snf-astakos-app/astakos/im/settings.py
+++ b/snf-astakos-app/astakos/im/settings.py
@@ -143,8 +143,8 @@ SERVICES = getattr(settings, 'ASTAKOS_SERVICES',{
             },{
             'name':'disksize',
             'group':'compute',
-            'uplimit':5,
-            'unit':'GB',
+            'uplimit':5*1024*1024*1024,
+            'unit':'bytes',
             'desc': 'Virtual machine disk size'
             },{
             'name':'cpu',
@@ -154,8 +154,8 @@ SERVICES = getattr(settings, 'ASTAKOS_SERVICES',{
             },{
             'name':'ram',
             'group':'compute',
-            'uplimit':1024,
-            'unit':'MB',
+            'uplimit':1024*1024*1024,
+            'unit':'bytes',
             'desc': 'Virtual machines'
             }]
     },