diff options
| author | Christian Berendt <berendt@betacloud-solutions.de> | 2020-03-06 00:41:46 +0100 |
|---|---|---|
| committer | Christian Berendt <berendt@betacloud-solutions.de> | 2020-03-06 01:48:36 +0100 |
| commit | f5bb4776e4a6cf64a7b46fbed66e2f5215b1c99a (patch) | |
| tree | 4c332229b0338bf7554cd2dba428f917927326eb | |
| parent | 5f21b322d01d61f7be2542b36d4e2eee40ae1dc7 (diff) | |
| download | kolla-f5bb4776e4a6cf64a7b46fbed66e2f5215b1c99a.tar.gz kolla-f5bb4776e4a6cf64a7b46fbed66e2f5215b1c99a.zip | |
Unpin openstack/requirements
Pinning no longer required because of the black list of
oslo.cache 2.1.0 in openstack/requirements.
Related-Bug: #1866008
Change-Id: I9e30f161938c4fe45d91c35d26b308148d082ca8
Depends-On: https://review.opendev.org/#/c/711427/
| -rwxr-xr-x | kolla/common/config.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 88951d9c0..12920586e 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -292,14 +292,10 @@ _BASE_OPTS = [ SOURCES = { - # FIXME(mgoddard): Pinning requirements to - # ea42244642c3c091cb4f70917ae8d79af217b6af. This is required to avoid - # oslo.cache 2.1.0, which breaks us. See - # https://bugs.launchpad.net/kolla-ansible/+bug/1866008. 'openstack-base': { - 'type': 'git', - 'location': 'https://opendev.org/openstack/requirements', - 'reference': 'ea42244642c3c091cb4f70917ae8d79af217b6af'}, + 'type': 'url', + 'location': ('$tarballs_base/requirements/' + 'requirements-${openstack_branch}.tar.gz')}, 'aodh-base': { 'type': 'url', 'location': ('$tarballs_base/aodh/' |