Merge branch 'master' of https://github.com/honza801/webvirtcloud

Conflicts:
	instances/templates/instance.html
	instances/views.py

accounts/migrations/0004_userattributes.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('accounts', '0003_usersshkey'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UserAttributes',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('max_instances', models.IntegerField(default=0)),
+                ('max_cpus', models.IntegerField(default=0)),
+                ('max_memory', models.IntegerField(default=0)),
+                ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

accounts/migrations/0005_userattributes_can_clone_instances.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0004_userattributes'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userattributes',
+            name='can_clone_instances',
+            field=models.BooleanField(default=False),
+        ),
+    ]

accounts/migrations/0006_userattributes_max_disk_size.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0005_userattributes_can_clone_instances'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userattributes',
+            name='max_disk_size',
+            field=models.IntegerField(default=0),
+        ),
+    ]

accounts/migrations/0007_auto_20160426_0635.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0006_userattributes_max_disk_size'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userattributes',
+            name='max_cpus',
+            field=models.IntegerField(default=1),
+        ),
+        migrations.AlterField(
+            model_name='userattributes',
+            name='max_disk_size',
+            field=models.IntegerField(default=20),
+        ),
+        migrations.AlterField(
+            model_name='userattributes',
+            name='max_instances',
+            field=models.IntegerField(default=1),
+        ),
+        migrations.AlterField(
+            model_name='userattributes',
+            name='max_memory',
+            field=models.IntegerField(default=2048),
+        ),
+    ]