aboutsummaryrefslogtreecommitdiff
path: root/docker/blazar
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/blazar
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/blazar')
-rw-r--r--docker/blazar/blazar-api/Dockerfile.j218
-rw-r--r--docker/blazar/blazar-api/extend_start.sh8
-rw-r--r--docker/blazar/blazar-base/Dockerfile.j229
-rw-r--r--docker/blazar/blazar-base/extend_start.sh10
-rw-r--r--docker/blazar/blazar-manager/Dockerfile.j215
5 files changed, 0 insertions, 80 deletions
diff --git a/docker/blazar/blazar-api/Dockerfile.j2 b/docker/blazar/blazar-api/Dockerfile.j2
deleted file mode 100644
index 70d6ba22a..000000000
--- a/docker/blazar/blazar-api/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}blazar-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block blazar_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-COPY extend_start.sh /usr/local/bin/kolla_blazar_extend_start
-RUN chmod 644 /usr/local/bin/kolla_blazar_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block blazar_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER blazar
diff --git a/docker/blazar/blazar-api/extend_start.sh b/docker/blazar/blazar-api/extend_start.sh
deleted file mode 100644
index ff4f2b801..000000000
--- a/docker/blazar/blazar-api/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# 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
- blazar-db-manage --config-file /etc/blazar/blazar.conf upgrade head
- exit 0
-fi
diff --git a/docker/blazar/blazar-base/Dockerfile.j2 b/docker/blazar/blazar-base/Dockerfile.j2
deleted file mode 100644
index 433842e41..000000000
--- a/docker/blazar/blazar-base/Dockerfile.j2
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block blazar_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='blazar') }}
-
-ADD blazar-base-archive /blazar-base-source
-
-{% set blazar_base_pip_packages = [
- '/blazar'
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s blazar-base-source/* blazar \
- && {{ macros.install_pip(blazar_base_pip_packages | customizable("pip_packages")) }} \
- && mkdir -p /etc/blazar \
- && cp -r /blazar/etc/blazar/* /etc/blazar \
- && touch /usr/local/bin/kolla_blazar_extend_start \
- && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_blazar_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block blazar_base_footer %}{% endblock %}
diff --git a/docker/blazar/blazar-base/extend_start.sh b/docker/blazar/blazar-base/extend_start.sh
deleted file mode 100644
index a96a4c113..000000000
--- a/docker/blazar/blazar-base/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/blazar" ]]; then
- mkdir -p /var/log/kolla/blazar
-fi
-if [[ $(stat -c %a /var/log/kolla/blazar) != "755" ]]; then
- chmod 755 /var/log/kolla/blazar
-fi
-
-. /usr/local/bin/kolla_blazar_extend_start
diff --git a/docker/blazar/blazar-manager/Dockerfile.j2 b/docker/blazar/blazar-manager/Dockerfile.j2
deleted file mode 100644
index 5cde3db3b..000000000
--- a/docker/blazar/blazar-manager/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}blazar-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block blazar_manager_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block blazar_manager_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER blazar