diff --git a/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py b/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py index 5684c8453..a9a8f4154 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py @@ -22,11 +22,7 @@ def upgrade(migrate_engine): # Align the current state/state_description with the # action/status now used in the event table action = sqlalchemy.Column('action', - sqlalchemy.String(length=255, - convert_unicode=False, - assert_unicode=None, - unicode_error=None, - _warn_on_bytestring=False)) + sqlalchemy.String(length=255)) action.create(resource) resource.c.state.alter(name='status') resource.c.state_description.alter(name='status_reason') diff --git a/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py b/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py index e6130edf0..4d635650d 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py @@ -21,11 +21,7 @@ def upgrade(migrate_engine): stack = sqlalchemy.Table('stack', meta, autoload=True) # Align with action/status now used in the event/resource tables action = sqlalchemy.Column('action', - sqlalchemy.String(length=255, - convert_unicode=False, - assert_unicode=None, - unicode_error=None, - _warn_on_bytestring=False)) + sqlalchemy.String(length=255)) action.create(stack)