diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-05 20:46:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-05 20:46:46 +0000 |
| commit | 5f21b322d01d61f7be2542b36d4e2eee40ae1dc7 (patch) | |
| tree | e09fd6dc228652a91d0729ddc1bada4208a67aa2 /kolla | |
| parent | de5964f21e2dcad4eae5e2525ccb3df00ff1198f (diff) | |
| parent | a755304795eb7bd43a26b7380aa2686151295c64 (diff) | |
| download | kolla-5f21b322d01d61f7be2542b36d4e2eee40ae1dc7.tar.gz kolla-5f21b322d01d61f7be2542b36d4e2eee40ae1dc7.zip | |
Merge "Multiple fixes to unblock CI"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 12920586e..88951d9c0 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -292,10 +292,14 @@ _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': 'url', - 'location': ('$tarballs_base/requirements/' - 'requirements-${openstack_branch}.tar.gz')}, + 'type': 'git', + 'location': 'https://opendev.org/openstack/requirements', + 'reference': 'ea42244642c3c091cb4f70917ae8d79af217b6af'}, 'aodh-base': { 'type': 'url', 'location': ('$tarballs_base/aodh/' |