From a354d644f199bcebd5ec8d16c40ab42cec43d3e5 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Mon, 19 Jan 2015 15:05:42 -0500 Subject: [PATCH] Controller.backend_type is required --- planetstack/core/admin.py | 2 +- planetstack/core/models/site.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py index 436543d..1debeb0 100644 --- a/planetstack/core/admin.py +++ b/planetstack/core/admin.py @@ -716,7 +716,7 @@ class ControllerAdminForm(forms.ModelForm): class ControllerAdmin(PlanetStackBaseAdmin): model = Controller - fieldList = ['name', 'version', 'backend_type', 'auth_url', 'admin_user', 'admin_tenant','admin_password'] + fieldList = ['name', 'backend_type', 'version', 'auth_url', 'admin_user', 'admin_tenant','admin_password'] #fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-general']})] inlines = [ControllerSiteInline] # ,ControllerImagesInline] list_display = ['backend_status_icon', 'name', 'version', 'backend_type'] diff --git a/planetstack/core/models/site.py b/planetstack/core/models/site.py index 67b77f5..cc2ad03 100644 --- a/planetstack/core/models/site.py +++ b/planetstack/core/models/site.py @@ -269,8 +269,8 @@ class Controller(PlCoreBase): deleted_objects = ControllerDeletionManager() name = models.CharField(max_length=200, unique=True, help_text="Name of the Controller") + backend_type = models.CharField(max_length=200, help_text="Type of compute controller, e.g. EC2, OpenStack, or OpenStack version") version = models.CharField(max_length=200, help_text="Controller version") - backend_type = models.CharField(max_length=200, null=True, blank=True, help_text="Type of compute controller, e.g. EC2, OpenStack, or OpenStack version") auth_url = models.CharField(max_length=200, null=True, blank=True, help_text="Auth url for the compute controller") admin_user = models.CharField(max_length=200, null=True, blank=True, help_text="Username of an admin user at this controller") admin_password = models.CharField(max_length=200, null=True, blank=True, help_text="Password of theadmin user at this controller") -- 2.43.0