diff options
| author | Zuul <zuul@review.opendev.org> | 2021-04-08 09:53:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-04-08 09:53:55 +0000 |
| commit | ab8ee75bda2df6a54bab63d90dd0a6542085704f (patch) | |
| tree | f76025623e1654fcbd28c1822d4eb89f020c5ed9 | |
| parent | 2b8ad5a4f099ff807997ba4314e2a3406204f5e1 (diff) | |
| parent | 910153f342ee7b3968c6f6ae8a2c427aa0f41f94 (diff) | |
| download | kolla-ab8ee75bda2df6a54bab63d90dd0a6542085704f.tar.gz kolla-ab8ee75bda2df6a54bab63d90dd0a6542085704f.zip | |
Merge "kolla-toolbox: Upgrade openvswitch collection to newer version"
| -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 |