openstack/kolla
Code Issues Proposed changes

Merge "kolla-toolbox: Upgrade openvswitch collection to newer version"

Browse Source
This commit is contained in:
Zuul 2021-04-08 09:53:55 +00:00 committed by Gerrit Code Review
commit ab8ee75bda
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,10 +80,12 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH
'pyudev', 'pyudev',
] %} ] %}
COPY requirements.yml /var/lib/ansible/
RUN {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \ RUN {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/ansible /usr/share/ansible \ && mkdir -p /etc/ansible /usr/share/ansible \
&& echo 'localhost ansible_connection=local ansible_python_interpreter={{ virtualenv_path }}/bin/python' > /etc/ansible/hosts \ && 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 ENV ANSIBLE_LIBRARY /usr/share/ansible:$ANSIBLE_LIBRARY

4
docker/kolla-toolbox/requirements.yml Normal file
View File

@ -0,0 +1,4 @@
---
collections:
- name: openvswitch.openvswitch
version: 2.0.0