diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2023-02-22 08:32:33 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-02-23 18:03:47 +0000 |
| commit | a83585d9286f007c785498713d48ca61edcdd95f (patch) | |
| tree | 6f2ab90da900000c015f923a046c69a9bef5e8c4 | |
| parent | 7bbf36cca0f77ebaa48b123f7f226a64065b74ff (diff) | |
| download | kolla-a83585d9286f007c785498713d48ca61edcdd95f.tar.gz kolla-a83585d9286f007c785498713d48ca61edcdd95f.zip | |
toolbox: use ansible-collections-openstack >2
Change-Id: I6564886f68a997b82b49b6f975283a6d95831ce6
| -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' |