aboutsummaryrefslogtreecommitdiff
path: root/docker/barbican
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/barbican
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/barbican')
-rw-r--r--docker/barbican/barbican-api/Dockerfile.j219
-rwxr-xr-xdocker/barbican/barbican-api/extend_start.sh8
-rw-r--r--docker/barbican/barbican-base/Dockerfile.j236
-rw-r--r--docker/barbican/barbican-base/barbican_sudoers1
-rwxr-xr-xdocker/barbican/barbican-base/extend_start.sh15
-rw-r--r--docker/barbican/barbican-keystone-listener/Dockerfile.j215
-rw-r--r--docker/barbican/barbican-worker/Dockerfile.j215
7 files changed, 0 insertions, 109 deletions
diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2
deleted file mode 100644
index e78f3ea63..000000000
--- a/docker/barbican/barbican-api/Dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block barbican_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-COPY extend_start.sh /usr/local/bin/kolla_barbican_extend_start
-
-RUN chmod 644 /usr/local/bin/kolla_barbican_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block barbican_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER barbican
diff --git a/docker/barbican/barbican-api/extend_start.sh b/docker/barbican/barbican-api/extend_start.sh
deleted file mode 100755
index c541d0343..000000000
--- a/docker/barbican/barbican-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
- barbican-db-manage upgrade
- exit 0
-fi
diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2
deleted file mode 100644
index 89c44ef9a..000000000
--- a/docker/barbican/barbican-base/Dockerfile.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block barbican_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='barbican', groups='nfast,hsmusers') }}
-
-{{ macros.install_packages(barbican_base_packages | customizable("packages")) }}
-
-{% set barbican_base_pip_packages = [
- '/barbican',
- 'pastedeploy',
- 'python-barbicanclient',
-] %}
-
-ADD barbican-base-archive /barbican-base-source
-
-COPY barbican_sudoers /etc/sudoers.d/kolla_barbican_sudoers
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s barbican-base-source/* barbican \
- && {{ macros.install_pip(barbican_base_pip_packages | customizable("pip_packages")) }} \
- && mkdir -p /etc/barbican \
- && cp -r /barbican/etc/barbican/* /etc/barbican/ \
- && chmod 750 /etc/sudoers.d \
- && chmod 640 /etc/sudoers.d/kolla_barbican_sudoers \
- && touch /usr/local/bin/kolla_barbican_extend_start \
- && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_barbican_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block barbican_base_footer %}{% endblock %}
diff --git a/docker/barbican/barbican-base/barbican_sudoers b/docker/barbican/barbican-base/barbican_sudoers
deleted file mode 100644
index 26ae4710e..000000000
--- a/docker/barbican/barbican-base/barbican_sudoers
+++ /dev/null
@@ -1 +0,0 @@
-%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R barbican\: /var/lib/barbican/, /bin/chown -R barbican\: /var/lib/barbican/
diff --git a/docker/barbican/barbican-base/extend_start.sh b/docker/barbican/barbican-base/extend_start.sh
deleted file mode 100755
index 16b41ad09..000000000
--- a/docker/barbican/barbican-base/extend_start.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Create log dir for Barbican logs
-LOG_DIR="/var/log/kolla/barbican"
-if [[ ! -d "${LOG_DIR}" ]]; then
- mkdir -p ${LOG_DIR}
-fi
-if [[ $(stat -c %U:%G ${LOG_DIR}) != "barbican:kolla" ]]; then
- chown barbican:kolla ${LOG_DIR}
-fi
-if [[ $(stat -c %a ${LOG_DIR}) != "755" ]]; then
- chmod 755 ${LOG_DIR}
-fi
-
-. /usr/local/bin/kolla_barbican_extend_start
diff --git a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 b/docker/barbican/barbican-keystone-listener/Dockerfile.j2
deleted file mode 100644
index 3329aed1b..000000000
--- a/docker/barbican/barbican-keystone-listener/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block barbican_keystone_listener_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block barbican_keystone_listener_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER barbican
diff --git a/docker/barbican/barbican-worker/Dockerfile.j2 b/docker/barbican/barbican-worker/Dockerfile.j2
deleted file mode 100644
index 9cba55b6b..000000000
--- a/docker/barbican/barbican-worker/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block barbican_worker_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block barbican_worker_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER barbican