Updated from global requirements
In newer versions of oslo.db, a sanity check is run to verify table's collations and ensure they're utf8. In order to un-block the gate, we need to land this patch, which is broken by this sanity check. I've disabled the sanity_check in this patch to help moving it forward and I've filed an issue on LP (#1453047) to track the explicit switch to utf-8. I preferred not to do the switch in this patch because it deserves its own commit so we can track it properly (and revert if needed). Partially-Fixes: #1453047 Change-Id: Ifffbdd50c38a1d25215faa6a966c2d2a63935711
This commit is contained in:
parent
bcc7721550
commit
9b8e2867d9
@ -62,4 +62,5 @@ def db_sync(version=None, init_version=0, engine=None):
|
|||||||
return get_backend().db_sync(engine=engine,
|
return get_backend().db_sync(engine=engine,
|
||||||
abs_path=MIGRATE_REPO_PATH,
|
abs_path=MIGRATE_REPO_PATH,
|
||||||
version=version,
|
version=version,
|
||||||
init_version=init_version)
|
init_version=init_version,
|
||||||
|
sanity_check=False)
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
pbr>=0.6,!=0.7,<1.0
|
pbr>=0.11,<2.0
|
||||||
#
|
#
|
||||||
# The greenlet package must be compiled with gcc and needs
|
# The greenlet package must be compiled with gcc and needs
|
||||||
# the Python.h headers. Make sure you install the python-dev
|
# the Python.h headers. Make sure you install the python-dev
|
||||||
@ -12,21 +12,21 @@ greenlet>=0.3.2
|
|||||||
# < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
|
# < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
|
||||||
SQLAlchemy>=0.9.7,<=0.9.99
|
SQLAlchemy>=0.9.7,<=0.9.99
|
||||||
anyjson>=0.3.3
|
anyjson>=0.3.3
|
||||||
eventlet>=0.16.1,!=0.17.0
|
eventlet>=0.17.3
|
||||||
PasteDeploy>=1.5.0
|
PasteDeploy>=1.5.0
|
||||||
Routes>=1.12.3,!=2.0
|
Routes>=1.12.3,!=2.0
|
||||||
WebOb>=1.2.3
|
WebOb>=1.2.3
|
||||||
sqlalchemy-migrate>=0.9.5
|
sqlalchemy-migrate>=0.9.5
|
||||||
httplib2>=0.7.5
|
httplib2>=0.7.5
|
||||||
kombu>=2.5.0
|
kombu>=3.0.7
|
||||||
pycrypto>=2.6
|
pycrypto>=2.6
|
||||||
iso8601>=0.1.9
|
iso8601>=0.1.9
|
||||||
oslo.config>=1.9.3,<1.10.0 # Apache-2.0
|
oslo.config>=1.11.0 # Apache-2.0
|
||||||
oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0
|
oslo.concurrency>=1.8.0 # Apache-2.0
|
||||||
oslo.context>=0.2.0,<0.3.0 # Apache-2.0
|
oslo.context>=0.2.0 # Apache-2.0
|
||||||
oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
|
oslo.utils>=1.4.0 # Apache-2.0
|
||||||
stevedore>=1.3.0,<1.4.0 # Apache-2.0
|
stevedore>=1.3.0 # Apache-2.0
|
||||||
taskflow>=0.7.1,<0.8.0
|
taskflow>=0.7.1
|
||||||
keystonemiddleware>=1.5.0
|
keystonemiddleware>=1.5.0
|
||||||
WSME>=0.6
|
WSME>=0.6
|
||||||
# For openstack/common/lockutils
|
# For openstack/common/lockutils
|
||||||
@ -36,23 +36,23 @@ posix_ipc
|
|||||||
python-swiftclient>=2.2.0
|
python-swiftclient>=2.2.0
|
||||||
|
|
||||||
# For VMware storage backed.
|
# For VMware storage backed.
|
||||||
oslo.vmware>=0.11.1,<0.12.0 # Apache-2.0
|
oslo.vmware>=0.11.1 # Apache-2.0
|
||||||
|
|
||||||
# For paste.util.template used in keystone.common.template
|
# For paste.util.template used in keystone.common.template
|
||||||
Paste
|
Paste
|
||||||
|
|
||||||
jsonschema>=2.0.0,<3.0.0
|
jsonschema>=2.0.0,<3.0.0
|
||||||
python-keystoneclient>=1.1.0
|
python-keystoneclient>=1.3.0
|
||||||
pyOpenSSL>=0.11
|
pyOpenSSL>=0.11
|
||||||
# Required by openstack.common libraries
|
# Required by openstack.common libraries
|
||||||
six>=1.9.0
|
six>=1.9.0
|
||||||
|
|
||||||
oslo.db>=1.7.0,<1.8.0 # Apache-2.0
|
oslo.db>=1.7.0 # Apache-2.0
|
||||||
oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0
|
oslo.i18n>=1.5.0 # Apache-2.0
|
||||||
oslo.log>=1.0.0,<1.1.0 # Apache-2.0
|
oslo.log>=1.0.0 # Apache-2.0
|
||||||
oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0
|
oslo.messaging>=1.8.0 # Apache-2.0
|
||||||
oslo.policy>=0.3.1,<0.4.0 # Apache-2.0
|
oslo.policy>=0.3.1 # Apache-2.0
|
||||||
oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0
|
oslo.serialization>=1.4.0 # Apache-2.0
|
||||||
|
|
||||||
retrying>=1.2.3,!=1.3.0 # Apache-2.0
|
retrying>=1.2.3,!=1.3.0 # Apache-2.0
|
||||||
osprofiler>=0.3.0 # Apache-2.0
|
osprofiler>=0.3.0 # Apache-2.0
|
||||||
|
@ -15,20 +15,20 @@ fixtures>=0.3.14
|
|||||||
mox3>=0.7.0
|
mox3>=0.7.0
|
||||||
mock>=1.0
|
mock>=1.0
|
||||||
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
|
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
|
||||||
requests>=2.2.0,!=2.4.0
|
requests>=2.5.2
|
||||||
testrepository>=0.0.18
|
testrepository>=0.0.18
|
||||||
testtools>=0.9.36,!=1.2.0
|
testtools>=0.9.36,!=1.2.0
|
||||||
psutil>=1.1.1,<2.0.0
|
psutil>=1.1.1,<2.0.0
|
||||||
oslotest>=1.5.1,<1.6.0 # Apache-2.0
|
oslotest>=1.5.1 # Apache-2.0
|
||||||
# Optional packages that should be installed when testing
|
# Optional packages that should be installed when testing
|
||||||
MySQL-python
|
MySQL-python
|
||||||
psycopg2
|
psycopg2
|
||||||
pysendfile==2.0.0
|
pysendfile>=2.0.0
|
||||||
qpid-python
|
qpid-python
|
||||||
xattr>=0.4
|
xattr>=0.4
|
||||||
|
|
||||||
# Documentation
|
# Documentation
|
||||||
oslosphinx>=2.5.0,<2.6.0 # Apache-2.0
|
oslosphinx>=2.5.0 # Apache-2.0
|
||||||
|
|
||||||
# Glance catalog index
|
# Glance catalog index
|
||||||
elasticsearch>=1.3.0
|
elasticsearch>=1.3.0
|
||||||
|
Loading…
Reference in New Issue
Block a user