Merge "Added vcpu_weight to models."

openstack · Oct 14, 2011 · 52b5611 · 52b5611
2 parents d01f17f + 6835f46
commit 52b5611
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/051_add_vcpu_weight_to_instance_types.py b/nova/db/sqlalchemy/migrate_repo/versions/051_add_vcpu_weight_to_instance_types.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import Column, Integer, MetaData, Table, Boolean
+from sqlalchemy import Column, Integer, MetaData, Table
 
 meta = MetaData()
 

diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
@@ -307,6 +307,7 @@ class InstanceTypes(BASE, NovaBase):
     swap = Column(Integer, nullable=False, default=0)
     rxtx_quota = Column(Integer, nullable=False, default=0)
     rxtx_cap = Column(Integer, nullable=False, default=0)
+    vcpu_weight = Column(Integer, nullable=True)
 
     instances = relationship(Instance,
                            backref=backref('instance_type', uselist=False),