aboutsummaryrefslogtreecommitdiff
path: root/docker/cinder/cinder-base
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2026-07-06 15:26:00 +0200
committerMichal Nasiadka <mnasiadka@gmail.com>2026-07-06 19:59:40 +0000
commitdb35ac8d793506bc43b62e7e39d27a75de1043ed (patch)
treefeec28d13a43490f5fd4260374144a1abfc20331 /docker/cinder/cinder-base
parent1ae1850557e3b99902f73b32c9005618537a1f2d (diff)
downloadkolla-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/cinder/cinder-base')
-rw-r--r--docker/cinder/cinder-base/Dockerfile.j260
-rw-r--r--docker/cinder/cinder-base/cinder_sudoers1
-rw-r--r--docker/cinder/cinder-base/extend_start.sh13
3 files changed, 0 insertions, 74 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
deleted file mode 100644
index bd25d9b18..000000000
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ /dev/null
@@ -1,60 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block cinder_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='cinder') }}
-
-{% if base_package_type == 'rpm' %}
-
-{{ macros.enable_extra_repos(['ceph', 'epel']) }}
-
- {% set cinder_base_packages = [
- 'ceph-common',
- 'cryptsetup',
- 'lvm2',
- 'nvme-cli',
- 'qemu-img',
- 'systemd-udev'
- ] %}
-{% elif base_package_type == 'deb' %}
- {% set cinder_base_packages = [
- 'ceph-common',
- 'cryptsetup',
- 'lvm2',
- 'nvme-cli',
- 'python3-cephfs',
- 'python3-rados',
- 'python3-rbd',
- 'qemu-utils'
- ] %}
-{% endif %}
-{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
-
-{% set cinder_base_pip_packages = [
- '/cinder'
-] %}
-
-ADD cinder-base-archive /cinder-base-source
-
-COPY cinder_sudoers /etc/sudoers.d/kolla_cinder_sudoers
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s cinder-base-source/* cinder \
- && {{ macros.install_pip(cinder_base_pip_packages | customizable("pip_packages")) }} \
- && mkdir -p /etc/cinder \
- && cp -r /cinder/etc/cinder/* /etc/cinder/ \
- && cp /var/lib/kolla/venv/etc/pycadf/cinder_api_audit_map.conf /etc/cinder/ \
- && 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/cinder/rootwrap.conf \
- && chmod 750 /etc/sudoers.d \
- && chmod 440 /etc/sudoers.d/kolla_cinder_sudoers \
- && touch /usr/local/bin/kolla_cinder_extend_start \
- && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cinder_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block cinder_base_footer %}{% endblock %}
diff --git a/docker/cinder/cinder-base/cinder_sudoers b/docker/cinder/cinder-base/cinder_sudoers
deleted file mode 100644
index 3750f31a0..000000000
--- a/docker/cinder/cinder-base/cinder_sudoers
+++ /dev/null
@@ -1 +0,0 @@
-cinder ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/cinder-rootwrap /etc/cinder/rootwrap.conf *
diff --git a/docker/cinder/cinder-base/extend_start.sh b/docker/cinder/cinder-base/extend_start.sh
deleted file mode 100644
index ddf1469c9..000000000
--- a/docker/cinder/cinder-base/extend_start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/cinder" ]]; then
- mkdir -p /var/log/kolla/cinder
-fi
-if [[ $(stat -c %U:%G /var/log/kolla/cinder) != "cinder:kolla" ]]; then
- chown -R cinder:kolla /var/log/kolla/cinder
-fi
-if [[ $(stat -c %a /var/log/kolla/cinder) != "755" ]]; then
- chmod 755 /var/log/kolla/cinder
-fi
-
-. /usr/local/bin/kolla_cinder_extend_start