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>

7 files changed, 0 insertions, 109 deletions

diff --git a/docker/cyborg/cyborg-agent/Dockerfile.j2 b/docker/cyborg/cyborg-agent/Dockerfile.j2
deleted file mode 100644
index dfc1adc0b..000000000
--- a/docker/cyborg/cyborg-agent/Dockerfile.j2
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block cyborg_agent_header %}{% endblock %}
-{% import "macros.j2" as macros with context %}
-
-{% set cyborg_agent_packages = [
-    'pciutils',
-] %}
-
-{{ macros.install_packages(cyborg_agent_packages | customizable("packages")) }}
-
-{% set cyborg_agent_pip_packages = [ ] %}
-
-RUN {{ macros.install_pip(cyborg_agent_pip_packages | customizable("pip_packages")) }}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block cyborg_agent_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2
deleted file mode 100644
index d67cdeb28..000000000
--- a/docker/cyborg/cyborg-api/Dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block cyborg_api_header %}{% endblock %}
-{% import "macros.j2" as macros with context %}
-
-{% set cyborg_api_packages = [
-] %}
-{{ macros.install_packages(cyborg_api_packages | customizable("packages")) }}
-
-COPY extend_start.sh /usr/local/bin/kolla_cyborg_extend_start
-RUN chmod 644 /usr/local/bin/kolla_cyborg_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block cyborg_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/cyborg/cyborg-api/extend_start.sh b/docker/cyborg/cyborg-api/extend_start.sh
deleted file mode 100644
index b1c7af7af..000000000
--- a/docker/cyborg/cyborg-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
-    cyborg-dbsync upgrade
-    exit 0
-fi
diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2
deleted file mode 100644
index c3f3e602a..000000000
--- a/docker/cyborg/cyborg-base/Dockerfile.j2
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block cyborg_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='cyborg') }}
-
-ADD cyborg-base-archive /cyborg-base-source
-
-{% set cyborg_base_pip_packages = [
-    '/cyborg'
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-COPY cyborg_sudoers /etc/sudoers.d/kolla_cyborg_sudoers
-
-RUN ln -s cyborg-base-source/* cyborg \
-    && {{ macros.install_pip(cyborg_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/cyborg/ \
-    && cp -r /cyborg/etc/cyborg/* /etc/cyborg/ \
-    && chmod 750 /etc/sudoers.d \
-    && touch /usr/local/bin/kolla_cyborg_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cyborg_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block cyborg_footer %}{% endblock %}
diff --git a/docker/cyborg/cyborg-base/cyborg_sudoers b/docker/cyborg/cyborg-base/cyborg_sudoers
deleted file mode 100644
index 63440026d..000000000
--- a/docker/cyborg/cyborg-base/cyborg_sudoers
+++ /dev/null
@@ -1 +0,0 @@
-%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R cyborg\: /var/lib/cyborg/, /bin/chown -R cyborg\: /var/lib/cyborg/
diff --git a/docker/cyborg/cyborg-base/extend_start.sh b/docker/cyborg/cyborg-base/extend_start.sh
deleted file mode 100755
index 10a58c626..000000000
--- a/docker/cyborg/cyborg-base/extend_start.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Create log dir for Cyborg logs
-CYBORG_LOG_DIR="/var/log/kolla/cyborg"
-if [[ ! -d "${CYBORG_LOG_DIR}" ]]; then
-    mkdir -p ${CYBORG_LOG_DIR}
-fi
-if [[ $(stat -c %U:%G ${CYBORG_LOG_DIR}) != "cyborg:kolla" ]]; then
-    chown cyborg:kolla ${CYBORG_LOG_DIR}
-fi
-if [[ $(stat -c %a ${CYBORG_LOG_DIR}) != "755" ]]; then
-    chmod 755 ${CYBORG_LOG_DIR}
-fi
-
-. /usr/local/bin/kolla_cyborg_extend_start
diff --git a/docker/cyborg/cyborg-conductor/Dockerfile.j2 b/docker/cyborg/cyborg-conductor/Dockerfile.j2
deleted file mode 100644
index d17d1cacd..000000000
--- a/docker/cyborg/cyborg-conductor/Dockerfile.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block cyborg_conductor_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block cyborg_conductor_footer %}{% endblock %}
-{% block footer %}{% endblock %}