diff options
| author | Zuul <zuul@review.opendev.org> | 2021-09-16 16:16:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-09-16 16:16:04 +0000 |
| commit | 78c3f39378c07cc2eea245afc698b07a40ee2695 (patch) | |
| tree | 93e234c17bc082e7c6b1ab572138adc06a68e341 | |
| parent | f98ad9462b7bd70ba79e448f97c7d3b21cf5e14b (diff) | |
| parent | 6eeb2cbdd106ec92f99b500acd8aaeea23278216 (diff) | |
| download | kolla-78c3f39378c07cc2eea245afc698b07a40ee2695.tar.gz kolla-78c3f39378c07cc2eea245afc698b07a40ee2695.zip | |
Merge "toolbox: Move to ansible-core 2.11 and collections"
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/kolla-toolbox/ansible.cfg | 3 | ||||
| -rw-r--r-- | docker/kolla-toolbox/requirements.yml | 12 | ||||
| -rw-r--r-- | releasenotes/notes/ansible-core-toolbox-e34b31422474684b.yaml | 4 |
4 files changed, 19 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 9261f5c0a..01292c135 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -82,7 +82,7 @@ RUN mkdir -p /requirements \ ENV PATH {{ virtualenv_path }}/bin:$PATH {% set kolla_toolbox_pip_packages = [ - 'ansible==2.10.*', + 'ansible-core==2.11.*', 'cmd2', 'influxdb', 'mysqlclient', diff --git a/docker/kolla-toolbox/ansible.cfg b/docker/kolla-toolbox/ansible.cfg index 53708de39..6f0ef76b0 100644 --- a/docker/kolla-toolbox/ansible.cfg +++ b/docker/kolla-toolbox/ansible.cfg @@ -1,3 +1,6 @@ [defaults] +# NOTE(mnasiadka): Omit deprecation warning for soft Python3.8 requirement on the controller +# for ansible-core 2.11. Deprecation warnings break output of kolla_toolbox. +deprecation_warnings = False remote_tmp = /tmp log_path = /var/log/kolla/ansible.log diff --git a/docker/kolla-toolbox/requirements.yml b/docker/kolla-toolbox/requirements.yml index ba82f5f0f..5b488ab43 100644 --- a/docker/kolla-toolbox/requirements.yml +++ b/docker/kolla-toolbox/requirements.yml @@ -1,4 +1,14 @@ --- collections: + - name: ansible.posix + version: '<2' + - name: community.general + version: '<4' + - name: community.mysql + version: '<3' + - name: community.rabbitmq + version: '<2' + - name: openstack.cloud + version: '<2' - name: openvswitch.openvswitch - version: 2.0.0 + version: '<3' diff --git a/releasenotes/notes/ansible-core-toolbox-e34b31422474684b.yaml b/releasenotes/notes/ansible-core-toolbox-e34b31422474684b.yaml new file mode 100644 index 000000000..f711380a9 --- /dev/null +++ b/releasenotes/notes/ansible-core-toolbox-e34b31422474684b.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Kolla toolbox is now using ansible-core 2.11. |