diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-06 12:00:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-06 12:00:28 +0000 |
| commit | d4b4a4ba251ac0537067970acff15e3a0645baa9 (patch) | |
| tree | ef0dac1a88ea90215c3ee95ef775ca486e513f19 | |
| parent | 1c8c9b42f295663fd641eadab89a82d4b93d18bf (diff) | |
| parent | f5bb4776e4a6cf64a7b46fbed66e2f5215b1c99a (diff) | |
| download | kolla-d4b4a4ba251ac0537067970acff15e3a0645baa9.tar.gz kolla-d4b4a4ba251ac0537067970acff15e3a0645baa9.zip | |
Merge "Unpin openstack/requirements"
| -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/' |