aboutsummaryrefslogtreecommitdiff
path: root/docker/aodh
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/aodh
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/aodh')
-rw-r--r--docker/aodh/aodh-api/Dockerfile.j216
-rw-r--r--docker/aodh/aodh-api/extend_start.sh8
-rw-r--r--docker/aodh/aodh-base/Dockerfile.j238
-rw-r--r--docker/aodh/aodh-base/aodh_sudoers1
-rwxr-xr-xdocker/aodh/aodh-base/extend_start.sh15
-rw-r--r--docker/aodh/aodh-evaluator/Dockerfile.j215
-rw-r--r--docker/aodh/aodh-expirer/Dockerfile.j215
-rw-r--r--docker/aodh/aodh-listener/Dockerfile.j215
-rw-r--r--docker/aodh/aodh-notifier/Dockerfile.j215
9 files changed, 0 insertions, 138 deletions
diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2
deleted file mode 100644
index b420df814..000000000
--- a/docker/aodh/aodh-api/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block aodh_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-COPY extend_start.sh /usr/local/bin/kolla_aodh_extend_start
-RUN chmod 644 /usr/local/bin/kolla_aodh_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block aodh_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/aodh/aodh-api/extend_start.sh b/docker/aodh/aodh-api/extend_start.sh
deleted file mode 100644
index 575b0e584..000000000
--- a/docker/aodh/aodh-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
- aodh-dbsync
- exit 0
-fi
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2
deleted file mode 100644
index 519537468..000000000
--- a/docker/aodh/aodh-base/Dockerfile.j2
+++ /dev/null
@@ -1,38 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block aodh_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='aodh') }}
-
-{% set aodh_base_packages = [
-] %}
-
-{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
-
-ADD aodh-base-archive /aodh-base-source
-
-{% set aodh_base_pip_packages = [
- '/aodh',
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-COPY aodh_sudoers /etc/sudoers.d/kolla_aodh_sudoers
-
-RUN ln -s aodh-base-source/* aodh \
- && {{ macros.install_pip(aodh_base_pip_packages | customizable("pip_packages")) }} \
- && mkdir -p /etc/aodh \
- && cp /aodh/aodh/api/api-paste.ini /etc/aodh/ \
- && chmod 644 /etc/aodh/api-paste.ini \
- && chmod 750 /etc/sudoers.d \
- && chmod 640 /etc/sudoers.d/kolla_aodh_sudoers \
- && touch /usr/local/bin/kolla_aodh_extend_start \
- && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_aodh_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block aodh_base_footer %}{% endblock %}
diff --git a/docker/aodh/aodh-base/aodh_sudoers b/docker/aodh/aodh-base/aodh_sudoers
deleted file mode 100644
index 2ec268c9d..000000000
--- a/docker/aodh/aodh-base/aodh_sudoers
+++ /dev/null
@@ -1 +0,0 @@
-%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R aodh\: /var/lib/aodh/, /bin/chown -R aodh\: /var/lib/aodh/
diff --git a/docker/aodh/aodh-base/extend_start.sh b/docker/aodh/aodh-base/extend_start.sh
deleted file mode 100755
index f3b1d2d49..000000000
--- a/docker/aodh/aodh-base/extend_start.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Create log dir for Aodh logs
-AODH_LOG_DIR="/var/log/kolla/aodh"
-if [[ ! -d "${AODH_LOG_DIR}" ]]; then
- mkdir -p ${AODH_LOG_DIR}
-fi
-if [[ $(stat -c %U:%G ${AODH_LOG_DIR}) != "aodh:kolla" ]]; then
- chown aodh:kolla ${AODH_LOG_DIR}
-fi
-if [[ $(stat -c %a ${AODH_LOG_DIR}) != "755" ]]; then
- chmod 755 ${AODH_LOG_DIR}
-fi
-
-. /usr/local/bin/kolla_aodh_extend_start
diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2
deleted file mode 100644
index 3d1f6a8b4..000000000
--- a/docker/aodh/aodh-evaluator/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block aodh_evaluator_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block aodh_evaluator_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER aodh
diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2
deleted file mode 100644
index 9c426f82c..000000000
--- a/docker/aodh/aodh-expirer/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block aodh_expirer_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block aodh_expirer_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER aodh
diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2
deleted file mode 100644
index a6f4f3c0e..000000000
--- a/docker/aodh/aodh-listener/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block aodh_listener_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block aodh_listener_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER aodh
diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2
deleted file mode 100644
index c49f37441..000000000
--- a/docker/aodh/aodh-notifier/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block aodh_notifier_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block aodh_notifier_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER aodh