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/manila | |
| 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/manila')
| -rw-r--r-- | docker/manila/manila-api/Dockerfile.j2 | 23 | ||||
| -rw-r--r-- | docker/manila/manila-api/extend_start.sh | 9 | ||||
| -rw-r--r-- | docker/manila/manila-base/Dockerfile.j2 | 48 | ||||
| -rw-r--r-- | docker/manila/manila-base/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/manila/manila-base/manila_sudoers | 1 | ||||
| -rw-r--r-- | docker/manila/manila-data/Dockerfile.j2 | 31 | ||||
| -rw-r--r-- | docker/manila/manila-scheduler/Dockerfile.j2 | 15 | ||||
| -rw-r--r-- | docker/manila/manila-share/Dockerfile.j2 | 34 |
8 files changed, 0 insertions, 171 deletions
diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 deleted file mode 100644 index d7b75d388..000000000 --- a/docker/manila/manila-api/Dockerfile.j2 +++ /dev/null @@ -1,23 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block manila_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% set manila_api_packages = [ -] %} -{{ macros.install_packages(manila_api_packages | customizable("packages")) }} - -COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start - -RUN chmod 644 /usr/local/bin/kolla_manila_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block manila_api_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER manila diff --git a/docker/manila/manila-api/extend_start.sh b/docker/manila/manila-api/extend_start.sh deleted file mode 100644 index bea77dbba..000000000 --- a/docker/manila/manila-api/extend_start.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -o errexit - -# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases -# of the KOLLA_BOOTSTRAP variable being set, including empty. -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - manila-manage db sync - exit 0 -fi diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 deleted file mode 100644 index a236a20df..000000000 --- a/docker/manila/manila-base/Dockerfile.j2 +++ /dev/null @@ -1,48 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block manila_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='manila') }} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['openvswitch']) }} - - {% set manila_base_packages = ['openvswitch${KOLLA_RPM_OVS_VERSION}'] %} - -{% elif base_package_type == 'deb' %} - - {% set manila_base_packages = ['openvswitch-switch'] %} - -{% endif %} - -{{ macros.install_packages(manila_base_packages | customizable("packages")) }} - -ADD manila-base-archive /manila-base-source - -{% set manila_base_pip_packages = [ - '/manila' -] %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -COPY manila_sudoers /etc/sudoers.d/kolla_manila_sudoers - -RUN ln -s manila-base-source/* manila \ - && {{ macros.install_pip(manila_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/manila /var/cache/manila \ - && cp -r /manila/etc/manila/* /etc/manila/ \ - && chown -R manila: /var/cache/manila \ - && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/manila/rootwrap.conf \ - && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_manila_sudoers \ - && touch /usr/local/bin/kolla_manila_extend_start \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_manila_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block manila_base_footer %}{% endblock %} diff --git a/docker/manila/manila-base/extend_start.sh b/docker/manila/manila-base/extend_start.sh deleted file mode 100644 index c018416a3..000000000 --- a/docker/manila/manila-base/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/manila" ]]; then - mkdir -p /var/log/kolla/manila -fi -if [[ $(stat -c %a /var/log/kolla/manila) != "755" ]]; then - chmod 755 /var/log/kolla/manila -fi - -. /usr/local/bin/kolla_manila_extend_start diff --git a/docker/manila/manila-base/manila_sudoers b/docker/manila/manila-base/manila_sudoers deleted file mode 100644 index 623e6789b..000000000 --- a/docker/manila/manila-base/manila_sudoers +++ /dev/null @@ -1 +0,0 @@ -manila ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/manila-rootwrap /etc/manila/rootwrap.conf * diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2 deleted file mode 100644 index 06e1d9dc9..000000000 --- a/docker/manila/manila-data/Dockerfile.j2 +++ /dev/null @@ -1,31 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block manila_data_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - - {% set manila_data_packages = [ - 'nfs-utils' - ] %} - -{% elif base_package_type == 'deb' %} - - {% set manila_data_packages = [ - 'nfs-common' - ] %} - -{% endif %} - -{{ macros.install_packages(manila_data_packages | customizable("packages")) }} - -{{ macros.kolla_patch_sources() }} - -{% block manila_data_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER manila diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/docker/manila/manila-scheduler/Dockerfile.j2 deleted file mode 100644 index 12f7860f4..000000000 --- a/docker/manila/manila-scheduler/Dockerfile.j2 +++ /dev/null @@ -1,15 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block manila_scheduler_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.kolla_patch_sources() }} - -{% block manila_scheduler_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER manila diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 deleted file mode 100644 index 161b6865a..000000000 --- a/docker/manila/manila-share/Dockerfile.j2 +++ /dev/null @@ -1,34 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block manila_share_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - {% set manila_share_packages = [ - 'ceph-common', - 'sqlite', - ] %} -{% elif base_package_type == 'deb' %} - {% set manila_share_packages = [ - 'ceph-common', - 'glusterfs-client', - 'python3-cephfs', - 'python3-rados', - 'python3-rbd', - 'sqlite3' - ] %} - -{% endif %} - -{{ macros.install_packages(manila_share_packages | customizable("packages")) }} - -{{ macros.kolla_patch_sources() }} - -{% block manila_share_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER manila |
