diff options
| author | Zuul <zuul@review.opendev.org> | 2023-09-06 07:21:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-09-06 07:21:45 +0000 |
| commit | fab86165ebaab353c2c29dc672638f12d2dd08ee (patch) | |
| tree | 343ad1e1809452bbaa19b3758907efb29d63a416 /docker | |
| parent | ec40b9de283deecb845f4a519809144f8b19de4c (diff) | |
| parent | 7f38e1df71eafb250b14c4e125c7313bd9218f7d (diff) | |
| download | kolla-fab86165ebaab353c2c29dc672638f12d2dd08ee.tar.gz kolla-fab86165ebaab353c2c29dc672638f12d2dd08ee.zip | |
Merge "Improve kolla-toolbox offline support."
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 5dadf0797..2120eb4cf 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -77,16 +77,19 @@ ENV PATH {{ venv_path }}/bin:$PATH 'pyudev', ] %} -COPY requirements.yml /var/lib/ansible/ RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \ && {{ 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={{ venv_path }}/bin/python' > /etc/ansible/hosts \ - && sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' {{ os_client_config }} \ - && for i in {1..5}; do ansible-galaxy collection install --timeout 120 -p /usr/share/ansible/collections -r /var/lib/ansible/requirements.yml \ + && sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' {{ os_client_config }} + +{% block kolla_toolbox_collections_install %} +COPY requirements.yml /var/lib/ansible/ +RUN for i in {1..5}; do ansible-galaxy collection install --timeout 120 -p /usr/share/ansible/collections -r /var/lib/ansible/requirements.yml \ && break || sleep 15; done ENV ANSIBLE_LIBRARY /usr/share/ansible:$ANSIBLE_LIBRARY +{% endblock %} COPY find_disks.py /usr/share/ansible/ COPY ansible.cfg /etc/ansible/ansible.cfg |