diff options
| -rw-r--r-- | kolla/common/sources.py | 4 | ||||
| -rw-r--r-- | kolla/docker/kolla-toolbox/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | kolla/docker/neutron/neutron-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | releasenotes/notes/ansible-core-2-21-f4ce0f38d15c7606.yaml | 5 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
5 files changed, 11 insertions, 3 deletions
diff --git a/kolla/common/sources.py b/kolla/common/sources.py index 124300f99..5d19d6530 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -226,6 +226,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/networking-sfc/' 'networking-sfc-${openstack_branch}.tar.gz')}, + 'neutron-base-plugin-tap-as-a-service': { + 'type': 'url', + 'location': ('$tarballs_base/openstack/tap-as-a-service/' + 'tap-as-a-service-${openstack_branch}.tar.gz')}, 'neutron-base-plugin-vpnaas-agent': { 'type': 'url', 'location': ('$tarballs_base/openstack/neutron-vpnaas/' diff --git a/kolla/docker/kolla-toolbox/Dockerfile.j2 b/kolla/docker/kolla-toolbox/Dockerfile.j2 index eac78905d..e1556e310 100644 --- a/kolla/docker/kolla-toolbox/Dockerfile.j2 +++ b/kolla/docker/kolla-toolbox/Dockerfile.j2 @@ -82,7 +82,7 @@ RUN case "$UPPER_CONSTRAINTS_FILE" in \ ENV PATH {{ venv_path }}/bin:$PATH {% set kolla_toolbox_pip_packages = [ - 'ansible-core==2.20.*', + 'ansible-core==2.21.*', 'ansible-runner', 'cmd2', 'openstacksdk', diff --git a/kolla/docker/neutron/neutron-base/Dockerfile.j2 b/kolla/docker/neutron/neutron-base/Dockerfile.j2 index e91c1e6e6..1550a0f76 100644 --- a/kolla/docker/neutron/neutron-base/Dockerfile.j2 +++ b/kolla/docker/neutron/neutron-base/Dockerfile.j2 @@ -63,7 +63,6 @@ ADD plugins-archive / {% set neutron_base_pip_packages = [ '/neutron', 'oslo-vmware', - 'tap-as-a-service' ] %} {% set neutron_base_plugins_pip_packages = [ diff --git a/releasenotes/notes/ansible-core-2-21-f4ce0f38d15c7606.yaml b/releasenotes/notes/ansible-core-2-21-f4ce0f38d15c7606.yaml new file mode 100644 index 000000000..f4ca30d03 --- /dev/null +++ b/releasenotes/notes/ansible-core-2-21-f4ce0f38d15c7606.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Version of ``ansible-core`` in ``kolla-toolbox`` has been updated to + ``2.21``. diff --git a/test-requirements.txt b/test-requirements.txt index 2acfc73a4..21459ec95 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,4 @@ -ansible-core>=2.18,<2.20; python_version >= '3.11' # GPLv3 +ansible-core>=2.20,<2.22; python_version >= '3.12' # GPLv3 bandit!=1.6.0,>=1.1.0 # Apache-2.0 bashate>=0.5.1 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 |