Skip to content

Commit 78c3f39

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "toolbox: Move to ansible-core 2.11 and collections"
2 parents f98ad94 + 6eeb2cb commit 78c3f39

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

docker/kolla-toolbox/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN mkdir -p /requirements \
8282
ENV PATH {{ virtualenv_path }}/bin:$PATH
8383

8484
{% set kolla_toolbox_pip_packages = [
85-
'ansible==2.10.*',
85+
'ansible-core==2.11.*',
8686
'cmd2',
8787
'influxdb',
8888
'mysqlclient',

docker/kolla-toolbox/ansible.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[defaults]
2+
# NOTE(mnasiadka): Omit deprecation warning for soft Python3.8 requirement on the controller
3+
# for ansible-core 2.11. Deprecation warnings break output of kolla_toolbox.
4+
deprecation_warnings = False
25
remote_tmp = /tmp
36
log_path = /var/log/kolla/ansible.log
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
---
22
collections:
3+
- name: ansible.posix
4+
version: '<2'
5+
- name: community.general
6+
version: '<4'
7+
- name: community.mysql
8+
version: '<3'
9+
- name: community.rabbitmq
10+
version: '<2'
11+
- name: openstack.cloud
12+
version: '<2'
313
- name: openvswitch.openvswitch
4-
version: 2.0.0
14+
version: '<3'
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
upgrade:
3+
- |
4+
Kolla toolbox is now using ansible-core 2.11.

0 commit comments

Comments
 (0)