diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2026-07-06 15:26:00 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-07-06 19:59:40 +0000 |
| commit | db35ac8d793506bc43b62e7e39d27a75de1043ed (patch) | |
| tree | feec28d13a43490f5fd4260374144a1abfc20331 /docker/kolla-toolbox | |
| parent | 1ae1850557e3b99902f73b32c9005618537a1f2d (diff) | |
| download | kolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.tar.gz kolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.zip | |
Migrate to pyproject.toml
[tool.setuptools.data-files] does not support recursive directory
installation. The old setup.cfg [files] worked because PBR's
FilesConfig.expand_globs() used os.walk() to expand docker/*, but
this hook is not triggered by the pbr.build PEP-517 backend.
Move docker/ into kolla/ and use [tool.setuptools.package-data]
instead. Update kolla_worker._get_images_dir() to check the kolla
package directory first so both editable and regular installs work.
Change-Id: I4fc452c03740ef22ebbb4e8d0d86c4f4783e2d09
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker/kolla-toolbox')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 129 | ||||
| -rw-r--r-- | docker/kolla-toolbox/ansible.cfg | 4 | ||||
| -rw-r--r-- | docker/kolla-toolbox/ansible_sudoers | 3 | ||||
| l--------- | docker/kolla-toolbox/apt_preferences_rabbitmq.debian | 1 | ||||
| l--------- | docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu | 1 | ||||
| -rw-r--r-- | docker/kolla-toolbox/extend_start.sh | 13 | ||||
| -rw-r--r-- | docker/kolla-toolbox/kolla_toolbox.sh | 16 | ||||
| -rw-r--r-- | docker/kolla-toolbox/requirements.yml | 14 |
8 files changed, 0 insertions, 181 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 deleted file mode 100644 index eac78905d..000000000 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ /dev/null @@ -1,129 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block kolla_toolbox_header %}{% endblock %} - -{% set venv_path='/opt/ansible' %} -{% set os_client_config= venv_path + '/lib/python3/site-packages/os_client_config/defaults.json' %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='ansible') }} -{{ macros.configure_user(name='rabbitmq') }} - -{{ macros.enable_extra_repos(['erlang', 'rabbitmq']) }} - -{% block rabbitmq_apt_preferences %} -{% if base_package_type == 'deb' %} -COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq -{% endif %} -{% endblock %} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['crb', 'epel', 'openvswitch']) }} - - {% set kolla_toolbox_packages = [ - 'erlang-27.*', - 'gcc', - 'gdisk', - 'git', - 'jq', - 'libffi-devel', - 'libxml2-devel', - 'libxslt-devel', - 'make', - 'openssh-clients', - 'openssl-devel', - 'openvswitch${KOLLA_RPM_OVS_VERSION}', - 'python3', - 'python3-devel', - 'rabbitmq-server-4.2.*' - ] %} - -{% elif base_package_type == 'deb' %} - {% set kolla_toolbox_packages = [ - 'build-essential', - 'ca-certificates', - 'gdisk', - 'git', - 'jq', - 'libffi-dev', - 'libssl-dev', - 'libxslt1-dev', - 'openvswitch-switch', - 'python3-dev', - 'python3-venv', - 'rabbitmq-server', - ] %} -{% endif %} -{{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }} - -{% block kolla_toolbox_pip_conf %} -ENV UPPER_CONSTRAINTS_FILE=/requirements/upper-constraints.txt -{% endblock %} - -{% block kolla_toolbox_upper_constraints %} -ADD kolla-toolbox-archive /kolla-toolbox-source - -RUN case "$UPPER_CONSTRAINTS_FILE" in \ - http*) mkdir -p /requirements && curl -LO $UPPER_CONSTRAINTS_FILE /requirements/upper-constraints.txt ;; \ - *) ln -s kolla-toolbox-source/* /requirements ;; \ - esac \ - && {{ macros.upper_constraints_remove("openstacksdk") }} \ - && python3 -m venv --system-site-packages {{ venv_path }} \ - && KOLLA_DISTRO_PYTHON_VERSION=$(/usr/bin/python3 -c "import sys; print('{}.{}'.format(sys.version_info.major, sys.version_info.minor))") \ - && cd {{ venv_path }}/lib \ - && ln -s python${KOLLA_DISTRO_PYTHON_VERSION} {{ venv_path }}/lib/python3 -{% endblock %} - -ENV PATH {{ venv_path }}/bin:$PATH - -{% set kolla_toolbox_pip_packages = [ - 'ansible-core==2.20.*', - 'ansible-runner', - 'cmd2', - 'openstacksdk', - 'os-client-config', - 'pbr', - 'pymysql', - 'python-ironicclient', - 'python-openstackclient', - 'pytz', - 'pyudev', - ] %} - -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 }} - -{% block kolla_toolbox_collections_install %} -COPY requirements.yml /var/lib/ansible/ -RUN fail=1; for i in $(seq 1 5); do if \ -ansible-galaxy collection install --timeout 120 -p /usr/share/ansible/collections -r /var/lib/ansible/requirements.yml \ -; then fail=0; break; fi; echo "Collection download failed, retrying"; sleep 5; done; \ -if [ "$fail" -eq 1 ]; then exit 1; fi - -ENV ANSIBLE_LIBRARY /usr/share/ansible:$ANSIBLE_LIBRARY -{% endblock %} - -COPY ansible.cfg /etc/ansible/ansible.cfg -COPY ansible_sudoers /etc/sudoers.d/kolla_ansible_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start -COPY kolla_toolbox.sh /usr/local/bin/kolla_toolbox - -RUN chmod 644 /etc/ansible/ansible.cfg \ - /usr/local/bin/kolla_extend_start \ - && chmod 755 /usr/local/bin/kolla_toolbox \ - && chmod 440 /etc/sudoers.d/kolla_ansible_sudoers - -{{ macros.kolla_patch_sources() }} - -{% block kolla_toolbox_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER ansible diff --git a/docker/kolla-toolbox/ansible.cfg b/docker/kolla-toolbox/ansible.cfg deleted file mode 100644 index ec505f4a4..000000000 --- a/docker/kolla-toolbox/ansible.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[defaults] -inject_facts_as_vars = False -log_path = /var/log/kolla/ansible.log -remote_tmp = /tmp diff --git a/docker/kolla-toolbox/ansible_sudoers b/docker/kolla-toolbox/ansible_sudoers deleted file mode 100644 index 5a3f109b4..000000000 --- a/docker/kolla-toolbox/ansible_sudoers +++ /dev/null @@ -1,3 +0,0 @@ -Defaults secure_path="/opt/ansible/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - -ansible ALL=(root) NOPASSWD: /opt/ansible/bin/ansible localhost -m find_disks -a *, /usr/local/bin/ansible localhost -m find_disks -a * diff --git a/docker/kolla-toolbox/apt_preferences_rabbitmq.debian b/docker/kolla-toolbox/apt_preferences_rabbitmq.debian deleted file mode 120000 index f1cc84d9b..000000000 --- a/docker/kolla-toolbox/apt_preferences_rabbitmq.debian +++ /dev/null @@ -1 +0,0 @@ -../rabbitmq/apt_preferences_rabbitmq.debian
\ No newline at end of file diff --git a/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu b/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu deleted file mode 120000 index 977ded074..000000000 --- a/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu +++ /dev/null @@ -1 +0,0 @@ -../rabbitmq/apt_preferences_rabbitmq.ubuntu
\ No newline at end of file diff --git a/docker/kolla-toolbox/extend_start.sh b/docker/kolla-toolbox/extend_start.sh deleted file mode 100644 index 198587145..000000000 --- a/docker/kolla-toolbox/extend_start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -if [[ ! -f "/var/log/kolla/ansible.log" ]]; then - touch /var/log/kolla/ansible.log -fi - -if [[ $(stat -c %U:%G /var/log/kolla/ansible.log) != "ansible:kolla" ]]; then - chown -R ansible:kolla /var/log/kolla/ansible.log -fi - -if [[ $(stat -c %a /var/log/kolla/ansible.log) != "664" ]]; then - chmod 664 /var/log/kolla/ansible.log -fi diff --git a/docker/kolla-toolbox/kolla_toolbox.sh b/docker/kolla-toolbox/kolla_toolbox.sh deleted file mode 100644 index 5dfd65338..000000000 --- a/docker/kolla-toolbox/kolla_toolbox.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -catch_term() { - exit 0 -} - -catch_quit() { - exit 0 -} - -trap catch_term SIGTERM -trap catch_quit SIGQUIT - -while :; do - sleep 1 -done diff --git a/docker/kolla-toolbox/requirements.yml b/docker/kolla-toolbox/requirements.yml deleted file mode 100644 index 83c795142..000000000 --- a/docker/kolla-toolbox/requirements.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -collections: - - name: ansible.posix - version: '<3' - - name: community.general - version: '<13' - - name: community.mysql - version: '<5' - - name: community.rabbitmq - version: '<2' - - name: openstack.cloud - version: '<3' - - name: openvswitch.openvswitch - version: '<3' |
