diff options
| author | Rick Harris <rconradharris@gmail.com> | 2013-02-21 23:12:38 +0000 |
|---|---|---|
| committer | Rick Harris <rconradharris@gmail.com> | 2013-02-21 23:12:38 +0000 |
| commit | e7dcbf570b2b4e8385b085c5c9ce4e6ad5a0c0ab (patch) | |
| tree | 347b1db13e5fec2b3bd94c6242959cbd8563b66b | |
| parent | e9d893a69cfdc6af8ec9a06bbd94ca6fed1eb09c (diff) | |
| download | nova-e7dcbf570b2b4e8385b085c5c9ce4e6ad5a0c0ab.tar.gz nova-e7dcbf570b2b4e8385b085c5c9ce4e6ad5a0c0ab.tar.xz nova-e7dcbf570b2b4e8385b085c5c9ce4e6ad5a0c0ab.zip | |
BM Migrations 2 & 3: Fix drop_column statements
`drop_column` takes a string not a `Column` object.
Change-Id: I01d537f78e40a20b762439087a13e104b9d18d46
| -rw-r--r-- | nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/002_drop_bm_deployments.py | 9 | ||||
| -rw-r--r-- | nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/003_add_uuid_to_bm_nodes.py | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/002_drop_bm_deployments.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/002_drop_bm_deployments.py index 2a560e24e..a9fc649e2 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/002_drop_bm_deployments.py +++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/002_drop_bm_deployments.py @@ -47,13 +47,8 @@ def downgrade(migrate_engine): bm_nodes = Table('bm_nodes', meta, autoload=True) - image_path = Column('image_path', String(length=255)) - pxe_config_path = Column('pxe_config_path', String(length=255)) - deploy_key = Column('deploy_key', String(length=255)) - root_mb = Column('root_mb', Integer()) - swap_mb = Column('swap_mb', Integer()) - - for c in [image_path, pxe_config_path, deploy_key, root_mb, swap_mb]: + for c in ['image_path', 'pxe_config_path', 'deploy_key', 'root_mb', + 'swap_mb']: bm_nodes.drop_column(c) bm_deployments = Table('bm_deployments', meta, diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/003_add_uuid_to_bm_nodes.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/003_add_uuid_to_bm_nodes.py index cc9a9316d..778719096 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/003_add_uuid_to_bm_nodes.py +++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/003_add_uuid_to_bm_nodes.py @@ -35,6 +35,5 @@ def downgrade(migrate_engine): meta.bind = migrate_engine t = Table('bm_nodes', meta, autoload=True) - uuid_col = Column('uuid', String(length=36)) - t.drop_column(uuid_col) + t.drop_column('uuid') |