move default cloud init into FlavorManager

Author: Gabriel Monroy

api/models.py

@@ -21,6 +21,8 @@
 from api import fields
 from celerytasks import chef, controller
 from celery.canvas import group
+import yaml
+import os.path
 
 
 # define custom signals
@@ -117,6 +119,14 @@ class Meta:
 @python_2_unicode_compatible
 class FlavorManager(models.Manager):
 
+    def load_cloud_config_base(self):
+        # load cloud-config-base yaml_
+        _cloud_config_path = os.path.abspath(
+                os.path.join(__file__, '..', 'files', 'cloud-config-base.yml'))
+        with open(_cloud_config_path) as f:
+            _data = f.read()
+        return yaml.safe_load(_data)
+
     def seed(self, user, **kwargs):
         # TODO: add optimized AMIs to default flavors
         flavors = (
@@ -145,9 +155,11 @@ def seed(self, user, **kwargs):
              'provider': 'ec2',
              'params': json.dumps({'region': 'sa-east-1'})},
         )
+        cloud_config = self.load_cloud_config_base()
         for flavor in flavors:
             provider = flavor.pop('provider')
             flavor['provider'] = Provider.objects.get(owner=user, id=provider)
+            flavor['init'] = cloud_config
             self.create(owner=user, **flavor)
 
 

api/views.py

@@ -15,9 +15,6 @@
 from rest_framework.response import Response
 from rest_framework.status import HTTP_400_BAD_REQUEST, HTTP_201_CREATED
 import json
-import os.path
-import yaml
-
 
 class AnonymousAuthentication(BaseAuthentication):
 
@@ -128,14 +125,6 @@ class ProviderViewSet(OwnerViewSet):
     lookup_field = 'id'
 
 
-def _load_cloud_config_base():
-    # load cloud-config-base yaml_
-    _cloud_config_path = os.path.abspath(
-            os.path.join(__file__, '..', 'files', 'cloud-config-base.yml'))
-    with open(_cloud_config_path) as f:
-        _data = f.read()
-    return yaml.safe_load(_data)
-
 class FlavorViewSet(OwnerViewSet):
 
     model = models.Flavor
@@ -146,7 +135,7 @@ def create(self, request, **kwargs):
         request._data = request.DATA.copy()
         # set default cloud-init configuration
         if not 'init' in request.DATA:
-            request.DATA['init'] = _load_cloud_config_base()
+            request.DATA['init'] = models.FlavorManager().load_cloud_config_base()
         return viewsets.ModelViewSet.create(self, request, **kwargs)