diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/140_create_project_default_volume_type.py b/cinder/db/sqlalchemy/migrate_repo/versions/140_create_project_default_volume_type.py index 4720b9f48e8..285ff7f4bc3 100644 --- a/cinder/db/sqlalchemy/migrate_repo/versions/140_create_project_default_volume_type.py +++ b/cinder/db/sqlalchemy/migrate_repo/versions/140_create_project_default_volume_type.py @@ -32,8 +32,8 @@ def upgrade(migrate_engine): Column('deleted_at', DateTime), Column('volume_type_id', String(36), ForeignKey('volume_types.id'), index=True), - Column('project_id', String(length=255), unique=True, - primary_key=True, nullable=False), + Column('project_id', String(length=255), primary_key=True, + nullable=False), Column('deleted', Boolean(create_constraint=True, name=None)), mysql_engine='InnoDB', mysql_charset='utf8' diff --git a/cinder/db/sqlalchemy/models.py b/cinder/db/sqlalchemy/models.py index 4f2cfca7f31..97a8f69eda8 100644 --- a/cinder/db/sqlalchemy/models.py +++ b/cinder/db/sqlalchemy/models.py @@ -518,7 +518,7 @@ class DefaultVolumeTypes(BASE, CinderBase): __tablename__ = "default_volume_types" volume_type_id = Column(String, ForeignKey('volume_types.id'), nullable=False, index=True) - project_id = Column(String(255), unique=True, primary_key=True) + project_id = Column(String(255), primary_key=True) volume_type = relationship( VolumeType, foreign_keys=volume_type_id, diff --git a/doc/source/cli/cli-manage-volumes.rst b/doc/source/cli/cli-manage-volumes.rst index 04c1f4cd918..a50fc1fde26 100644 --- a/doc/source/cli/cli-manage-volumes.rst +++ b/doc/source/cli/cli-manage-volumes.rst @@ -209,7 +209,7 @@ default_volume_type) can be checked with the following command: .. code-block:: console - $ cinder type-default + $ cinder type-default There are 2 ways to set the default volume type: