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>

4 files changed, 0 insertions, 83 deletions

diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2
deleted file mode 100644
index 3249b62d2..000000000
--- a/docker/opensearch/opensearch-dashboards/Dockerfile.j2
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block opensearch_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='opensearch-dashboards', shell='/bin/bash', homedir='/usr/share/opensearch-dashboards') }}
-{{ macros.enable_extra_repos(['opensearch-dashboards']) }}
-
-{% set opensearch_dashboards_packages = ['opensearch-dashboards'] %}
-
-{{ macros.install_packages(opensearch_dashboards_packages | customizable("packages")) }} \
-    && chown -R opensearch-dashboards:opensearch-dashboards /usr/share/opensearch-dashboards
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block opensearch_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER opensearch-dashboards
diff --git a/docker/opensearch/opensearch-dashboards/extend_start.sh b/docker/opensearch/opensearch-dashboards/extend_start.sh
deleted file mode 100644
index 608bb34bf..000000000
--- a/docker/opensearch/opensearch-dashboards/extend_start.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/opensearch-dashboards" ]]; then
-    mkdir -p /var/log/kolla/opensearch-dashboards
-fi
-if [[ $(stat -c %a /var/log/kolla/opensearch-dashboards) != "755" ]]; then
-    chmod 755 /var/log/kolla/opensearch-dashboards
-fi
-
-export DASHBOARDS_HOME=/usr/share/opensearch-dashboards
-
-PLUGIN_LIST=$($DASHBOARDS_HOME/bin/opensearch-dashboards-plugin list)
-if [[ "${OPENSEARCH_DASHBOARDS_SECURITY_PLUGIN:-True}" == "False" ]]; then
-    if [[ ${PLUGIN_LIST} =~ "securityDashboards" ]]; then
-        $DASHBOARDS_HOME/bin/opensearch-dashboards-plugin remove securityDashboards
-    fi
-fi
diff --git a/docker/opensearch/opensearch/Dockerfile.j2 b/docker/opensearch/opensearch/Dockerfile.j2
deleted file mode 100644
index 6ad8fb29a..000000000
--- a/docker/opensearch/opensearch/Dockerfile.j2
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block opensearch_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='opensearch', shell='/bin/bash', homedir='/usr/share/opensearch') }}
-{{ macros.enable_extra_repos(['opensearch']) }}
-
-    {% set opensearch_packages = [
-        'opensearch'
-    ] %}
-
-ENV OPENSEARCH_INITIAL_ADMIN_PASSWORD="Kolla24OpenSearch"
-
-{{ macros.install_packages(opensearch_packages | customizable("packages")) }} \
-    && chown -R opensearch:opensearch /usr/share/opensearch \
-    && rm -f /etc/opensearch/*.pem \
-    && rm -f /etc/opensearch/securityadmin_demo.sh
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block opensearch_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER opensearch
diff --git a/docker/opensearch/opensearch/extend_start.sh b/docker/opensearch/opensearch/extend_start.sh
deleted file mode 100644
index 5855b1be2..000000000
--- a/docker/opensearch/opensearch/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/opensearch" ]]; then
-    mkdir -p /var/log/kolla/opensearch
-fi
-if [[ $(stat -c %a /var/log/kolla/opensearch) != "755" ]]; then
-    chmod 755 /var/log/kolla/opensearch
-fi