summaryrefslogtreecommitdiffstats
path: root/nova/db
diff options
context:
space:
mode:
authorJason Koelker <jason@koelker.net>2011-07-22 16:47:37 -0500
committerJason Koelker <jason@koelker.net>2011-07-22 16:47:37 -0500
commite54f0cb05a3e10ad4234c672e2096da2a3eaa2da (patch)
tree19ac7d9048ce6267f53899b812ad24c085345c8f /nova/db
parentf3ddef7d541b31015117c35cb3aaa2fc15e1ccef (diff)
default to None in the method signature
Diffstat (limited to 'nova/db')
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py2
-rw-r--r--nova/db/sqlalchemy/models.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py b/nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py
index d9f82d796..c938eb716 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py
@@ -26,6 +26,7 @@ def upgrade(migrate_engine):
meta.bind = migrate_engine
networks = Table('networks', meta, autoload=True)
+ networks.c.dns.alter(Column('dns1', String(255)))
networks.create_column(dns2)
@@ -33,4 +34,5 @@ def downgrade(migrate_engine):
meta.bind = migrate_engine
networks = Table('networks', meta, autoload=True)
+ networks.c.dns1.alter(Column('dns', String(255)))
networks.drop_column(dns2)
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index cf00177c4..7e35c2cba 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -556,7 +556,7 @@ class Network(BASE, NovaBase):
bridge_interface = Column(String(255))
gateway = Column(String(255))
broadcast = Column(String(255))
- dns = Column(String(255))
+ dns1 = Column(String(255))
dns2 = Column(String(255))
vlan = Column(Integer)