diff options
| author | Michał Nasiadka <mnasiadka@gmail.com> | 2021-03-25 07:31:58 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2021-04-06 12:12:05 +0000 |
| commit | 910153f342ee7b3968c6f6ae8a2c427aa0f41f94 (patch) | |
| tree | bc9cde59120779158f180ed6d42aa03dbd15737b /docker/kolla-toolbox | |
| parent | ac4e496eeb93943c52a64c110a52d433378aa88b (diff) | |
| download | kolla-910153f342ee7b3968c6f6ae8a2c427aa0f41f94.tar.gz kolla-910153f342ee7b3968c6f6ae8a2c427aa0f41f94.zip | |
kolla-toolbox: Upgrade openvswitch collection to newer version
Ansible 2.10 includes openvswitch.openvswitch collection in lower version than
2.0.0 - which fixes the bug that state: absent requires value: to be set.
Related change: https://review.opendev.org/c/openstack/kolla-ansible/+/750631
Change-Id: I92dab4394b7eebdcff7f90765cde078c1292312b
Diffstat (limited to 'docker/kolla-toolbox')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/kolla-toolbox/requirements.yml | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index a5c9aa904..0508e5a12 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -80,10 +80,12 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH 'pyudev', ] %} +COPY requirements.yml /var/lib/ansible/ RUN {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/ansible /usr/share/ansible \ && echo 'localhost ansible_connection=local ansible_python_interpreter={{ virtualenv_path }}/bin/python' > /etc/ansible/hosts \ - && sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' {{ os_client_config }} + && sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' {{ os_client_config }} \ + && ansible-galaxy collection install -p /usr/share/ansible/collections -r /var/lib/ansible/requirements.yml ENV ANSIBLE_LIBRARY /usr/share/ansible:$ANSIBLE_LIBRARY diff --git a/docker/kolla-toolbox/requirements.yml b/docker/kolla-toolbox/requirements.yml new file mode 100644 index 000000000..ba82f5f0f --- /dev/null +++ b/docker/kolla-toolbox/requirements.yml @@ -0,0 +1,4 @@ +--- +collections: + - name: openvswitch.openvswitch + version: 2.0.0 |