diff options
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | releasenotes/notes/bug-2020761-c31f28c922ebcf84.yaml | 5 |
2 files changed, 11 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 diff --git a/releasenotes/notes/bug-2020761-c31f28c922ebcf84.yaml b/releasenotes/notes/bug-2020761-c31f28c922ebcf84.yaml new file mode 100644 index 000000000..c0d93a283 --- /dev/null +++ b/releasenotes/notes/bug-2020761-c31f28c922ebcf84.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes missing way for kolla-toolbox to be built offline. + `LP#2020761 <https://launchpad.net/bugs/2020761>`__ |