summaryrefslogtreecommitdiffstats
path: root/nova/db
diff options
context:
space:
mode:
authorJosh Kearney <josh.kearney@rackspace.com>2011-02-11 15:04:49 -0600
committerJosh Kearney <josh.kearney@rackspace.com>2011-02-11 15:04:49 -0600
commit4a058908db774bfebce4ece814534225e123345c (patch)
treeee6a6a5fb8e1f4e68ccdfc68107f6ca6054ba411 /nova/db
parenta36b67d192eb619963494896928efffef5dae4b6 (diff)
downloadnova-4a058908db774bfebce4ece814534225e123345c.tar.gz
nova-4a058908db774bfebce4ece814534225e123345c.tar.xz
nova-4a058908db774bfebce4ece814534225e123345c.zip
Added more columns to instance_types tables
Diffstat (limited to 'nova/db')
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/003_cactus.py4
-rw-r--r--nova/db/sqlalchemy/models.py3
2 files changed, 6 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/003_cactus.py b/nova/db/sqlalchemy/migrate_repo/versions/003_cactus.py
index f95996042..fec191214 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/003_cactus.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/003_cactus.py
@@ -41,7 +41,9 @@ instance_types = Table('instance_types', meta,
Column('vcpus', Integer(), nullable=False),
Column('local_gb', Integer(), nullable=False),
Column('flavorid', Integer(), nullable=False, unique=True),
- )
+ Column('swap', Integer(), nullable=False, default=0),
+ Column('rxtx_quota', Integer(), nullable=False, default=0),
+ Column('rxtx_cap', Integer(), nullable=False, default=0))
def upgrade(migrate_engine):
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 955d373fd..8ee3e3532 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -219,6 +219,9 @@ class InstanceTypes(BASE, NovaBase):
vcpus = Column(Integer)
local_gb = Column(Integer)
flavorid = Column(Integer, unique=True)
+ swap = Column(Integer, nullable=False, default=0)
+ rxtx_quota = Column(Integer, nullable=False, default=0)
+ rxtx_cap = Column(Integer, nullable=False, default=0)
class Volume(BASE, NovaBase):