diff options
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-rally/sqlalchemy-db-missing-name-for-ENUM.patch | 25 | ||||
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-rally_git.bb | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-rally/sqlalchemy-db-missing-name-for-ENUM.patch b/meta-openstack/recipes-devtools/python/python-rally/sqlalchemy-db-missing-name-for-ENUM.patch new file mode 100644 index 0000000..afb425c --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-rally/sqlalchemy-db-missing-name-for-ENUM.patch | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | sqlalchemy-db: missing name for ENUM | ||
| 2 | |||
| 3 | Command "rally-manage db recreate" gives the following error: | ||
| 4 | |||
| 5 | TRACE rally File "/usr/lib64/python2.7/site-packages/sqlalchemy/dialects/postgresql/base.py", line 898, in format_type | ||
| 6 | TRACE rally raise exc.CompileError("Postgresql ENUM type requires a name.") | ||
| 7 | TRACE rally CompileError: Postgresql ENUM type requires a name. | ||
| 8 | |||
| 9 | Signed-off-by: Vu Tran <vu.tran@windriver.com> | ||
| 10 | |||
| 11 | diff --git a/rally/db/sqlalchemy/models.py b/rally/db/sqlalchemy/models.py | ||
| 12 | index c68e345..5b2dbc0 100644 | ||
| 13 | --- a/rally/db/sqlalchemy/models.py | ||
| 14 | +++ b/rally/db/sqlalchemy/models.py | ||
| 15 | @@ -85,8 +85,8 @@ class Deployment(BASE, RallyBase): | ||
| 16 | ) | ||
| 17 | |||
| 18 | status = sa.Column( | ||
| 19 | - sa.Enum(*consts.DeployStatus), | ||
| 20 | - name='enum_deployments_status', | ||
| 21 | + sa.Enum(*consts.DeployStatus, | ||
| 22 | + name='enum_deployments_status'), | ||
| 23 | default=consts.DeployStatus.DEPLOY_INIT, | ||
| 24 | nullable=False, | ||
| 25 | ) | ||
diff --git a/meta-openstack/recipes-devtools/python/python-rally_git.bb b/meta-openstack/recipes-devtools/python/python-rally_git.bb index 2a83457..360e89f 100644 --- a/meta-openstack/recipes-devtools/python/python-rally_git.bb +++ b/meta-openstack/recipes-devtools/python/python-rally_git.bb | |||
| @@ -16,6 +16,7 @@ SRC_URI = "git://github.com/stackforge/${SRCNAME}.git;branch=master \ | |||
| 16 | file://deployment-existing.json \ | 16 | file://deployment-existing.json \ |
| 17 | file://remove-ironic-support.patch \ | 17 | file://remove-ironic-support.patch \ |
| 18 | file://verification-to-use-existing-tempest.patch \ | 18 | file://verification-to-use-existing-tempest.patch \ |
| 19 | file://sqlalchemy-db-missing-name-for-ENUM.patch \ | ||
| 19 | " | 20 | " |
| 20 | 21 | ||
| 21 | SRCREV="b297cf00750f263b8b5bdeb71f6952f672e87f5a" | 22 | SRCREV="b297cf00750f263b8b5bdeb71f6952f672e87f5a" |
