diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-22 18:44:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-22 18:44:28 +0000 |
| commit | 6a9da777e9759d49a555e95f6dd9728d5077f05a (patch) | |
| tree | d804fb2ebb24b9d06fcc427f1b79a597e81d44ed | |
| parent | 3561cd66e2f29113acca683c3ddfc8821bc30946 (diff) | |
| parent | e7dcbf570b2b4e8385b085c5c9ce4e6ad5a0c0ab (diff) | |
| download | nova-6a9da777e9759d49a555e95f6dd9728d5077f05a.tar.gz nova-6a9da777e9759d49a555e95f6dd9728d5077f05a.tar.xz nova-6a9da777e9759d49a555e95f6dd9728d5077f05a.zip | |
Merge "BM Migrations 2 & 3: Fix drop_column statements"
| -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') |