From: Scott Baker Date: Tue, 20 Jan 2015 08:05:11 +0000 (-0800) Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=fe290f49559b1e19b9251b83877862f70679bf86;hp=a1298a8aec652145ba249b6f8ccea96dcbb96b75 Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi --- 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") diff --git a/planetstack/openstack_observer/steps/sync_slivers.py b/planetstack/openstack_observer/steps/sync_slivers.py index 06a05f1..a2d0e81 100644 --- a/planetstack/openstack_observer/steps/sync_slivers.py +++ b/planetstack/openstack_observer/steps/sync_slivers.py @@ -114,7 +114,7 @@ class SyncSlivers(OpenStackSyncStep): 'availability_zone': availability_zone_filter, 'image_id':image_id, 'key_name':keyname, - 'flavor_id':3, + 'flavor_id':sliver.flavor.id, 'nics':nics, 'meta':metadata_update, 'key':key_fields,