diff options
| author | Zuul <zuul@review.opendev.org> | 2023-02-23 21:20:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-02-23 21:20:12 +0000 |
| commit | a627713720e1393a5296d9918fec4d9796a9b16f (patch) | |
| tree | 4021ff4c16a12d4d282334f0df23112044743b7a /docker | |
| parent | 83cb88fdad9433418a2d45cb923de167b2135106 (diff) | |
| parent | a83585d9286f007c785498713d48ca61edcdd95f (diff) | |
| download | kolla-a627713720e1393a5296d9918fec4d9796a9b16f.tar.gz kolla-a627713720e1393a5296d9918fec4d9796a9b16f.zip | |
Merge "toolbox: use ansible-collections-openstack >2"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/kolla-toolbox/requirements.yml | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index d5896add3..d38a1937f 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -58,7 +58,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% block kolla_toolbox_upper_constraints %} -{# NOTE(frickler): openstacksdk currently needs to be capped for ansible-openstack-collection #} RUN mkdir -p /requirements \ && 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 \ @@ -72,7 +71,7 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH 'ansible-core==2.14.*', 'cmd2', 'influxdb', - 'openstacksdk\<0.99.0', + 'openstacksdk', 'os-client-config', 'pbr', 'pymysql', diff --git a/docker/kolla-toolbox/requirements.yml b/docker/kolla-toolbox/requirements.yml index 5b488ab43..0c4025d01 100644 --- a/docker/kolla-toolbox/requirements.yml +++ b/docker/kolla-toolbox/requirements.yml @@ -9,6 +9,6 @@ collections: - name: community.rabbitmq version: '<2' - name: openstack.cloud - version: '<2' + version: '<3' - name: openvswitch.openvswitch version: '<3' |