openstack
/
kolla
Code Issues Proposed changes

toolbox: use ansible-collections-openstack >2 

Change-Id: I6564886f68a997b82b49b6f975283a6d95831ce6
This commit is contained in:
Michal Nasiadka 2023-02-22 08:32:33 +01:00
parent 7bbf36cca0
commit a83585d928
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/kolla-toolbox/Dockerfile.j2
View File

@ -58,7 +58,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %} ] %}
{% block kolla_toolbox_upper_constraints %} {% block kolla_toolbox_upper_constraints %}
{# NOTE(frickler): openstacksdk currently needs to be capped for ansible-openstack-collection #}
RUN mkdir -p /requirements \ RUN mkdir -p /requirements \
&& curl -o /requirements/upper-constraints.txt ${UPPER_CONSTRAINTS_FILE:-https://releases.openstack.org/constraints/upper/{{ openstack_release }}} \ && curl -o /requirements/upper-constraints.txt ${UPPER_CONSTRAINTS_FILE:-https://releases.openstack.org/constraints/upper/{{ openstack_release }}} \
&& sed -e "/^openstacksdk/d" -i /requirements/upper-constraints.txt \ && sed -e "/^openstacksdk/d" -i /requirements/upper-constraints.txt \
@ -72,7 +71,7 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH
'ansible-core==2.14.*', 'ansible-core==2.14.*',
'cmd2', 'cmd2',
'influxdb', 'influxdb',
'openstacksdk\<0.99.0', 'openstacksdk',
'os-client-config', 'os-client-config',
'pbr', 'pbr',
'pymysql', 'pymysql',

2
docker/kolla-toolbox/requirements.yml
View File

@ -9,6 +9,6 @@ collections:
- name: community.rabbitmq - name: community.rabbitmq
version: '<2' version: '<2'
- name: openstack.cloud - name: openstack.cloud
version: '<2' version: '<3'
- name: openvswitch.openvswitch - name: openvswitch.openvswitch
version: '<3' version: '<3'