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

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
 

docker/kolla-toolbox/requirements.yml

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