diff options
| author | Zuul <zuul@review.opendev.org> | 2023-09-14 12:19:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-09-14 12:19:46 +0000 |
| commit | 8484230ff72680a3967ee4039078d4b826d3c019 (patch) | |
| tree | ad40d0938b98eea3a15616bb5661d561f6ef36f7 | |
| parent | 5c408713952617b5d1b9e216cf2b8bb305e83a1b (diff) | |
| parent | 8558004ab70919cc2a822107c953a24710227f9e (diff) | |
| download | kolla-8484230ff72680a3967ee4039078d4b826d3c019.tar.gz kolla-8484230ff72680a3967ee4039078d4b826d3c019.zip | |
Merge "Improve kolla-toolbox offline support." into stable/zed
| -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 16029216d..06be9325d 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -82,15 +82,18 @@ ENV PATH {{ virtualenv_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={{ virtualenv_path }}/bin/python' > /etc/ansible/hosts \ - && 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 + && 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 ansible-galaxy collection install -p /usr/share/ansible/collections -r /var/lib/ansible/requirements.yml 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>`__ |