Merge pull request #345 from pigmej/new_db_nested_model_hotfix

Don't add nested models into defined_models, and don't create buckets
Mirantis · Nov 18, 2015 · be5f9b7 · be5f9b7
2 parents 611a462 + 4be2969
commit be5f9b7
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/solar/solar/dblayer/model.py b/solar/solar/dblayer/model.py
@@ -549,6 +549,9 @@ def __new__(mcs, name, bases, attrs):
         if bases == (object, ):
             return cls
 
+        if issubclass(cls, NestedModel):
+            return cls
+
         cls.bucket = Replacer('bucket', get_bucket, mcs)
         mcs._defined_models.add(cls)
         return cls