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>

3 files changed, 0 insertions, 97 deletions

diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
deleted file mode 100644
index 423a9760a..000000000
--- a/docker/nova/nova-base/Dockerfile.j2
+++ /dev/null
@@ -1,86 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block nova_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='nova', groups='qemu') }}
-
-{% if base_package_type == 'rpm' %}
-
-{{ macros.enable_extra_repos(['openvswitch']) }}
-
-    {% set nova_base_packages = [
-            'openvswitch${KOLLA_RPM_OVS_VERSION}',
-            'python3-openvswitch${KOLLA_RPM_OVS_VERSION}'
-    ] %}
-    {% if base_arch == 'x86_64' %}
-        {% set nova_base_packages = nova_base_packages + [
-            'edk2-ovmf'
-        ] %}
-    {% elif base_arch == 'aarch64' %}
-        {% set nova_base_packages = nova_base_packages + [
-            'edk2-aarch64'
-        ] %}
-    {% endif %}
-
-{% elif base_package_type == 'deb' %}
-
-    {% set nova_base_packages = [
-        'dnsmasq',
-        'ebtables',
-        'iproute2',
-        'iptables',
-        'openssh-client',
-        'openvswitch-switch',
-        'python3-libvirt',
-        'python3-openvswitch'
-    ] %}
-    {% if base_arch == 'x86_64' %}
-        {% set nova_base_packages = nova_base_packages + [
-            'ovmf'
-        ] %}
-    {% elif base_arch == 'aarch64' %}
-        {% set nova_base_packages = nova_base_packages + [
-            'qemu-efi-aarch64',
-        ] %}
-    {% endif %}
-
-{% endif %}
-
-{{ macros.install_packages(nova_base_packages | customizable("packages")) }}
-
-ADD nova-base-archive /nova-base-source
-ADD plugins-archive /
-
-{% set nova_base_pip_packages = [
-    '/nova'
-] %}
-
-{% set nova_base_plugins_pip_packages = [
-    '/plugins/*'
-] %}
-
-COPY nova_sudoers /etc/sudoers.d/kolla_nova_sudoers
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s nova-base-source/* nova \
-    && {{ macros.install_pip(nova_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/nova/ \
-    && cp -r /nova/etc/nova/* /etc/nova/ \
-    && cp /var/lib/kolla/venv/etc/pycadf/nova_api_audit_map.conf /etc/nova/ \
-    && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/nova/rootwrap.conf \
-    && if [ "$(ls /plugins)" ]; then \
-        {{ macros.install_pip(nova_base_plugins_pip_packages) }}; \
-       fi \
-    && chmod 750 /etc/sudoers.d \
-    && chmod 440 /etc/sudoers.d/kolla_nova_sudoers \
-    && touch /usr/local/bin/kolla_nova_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_nova_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block nova_base_footer %}{% endblock %}
diff --git a/docker/nova/nova-base/extend_start.sh b/docker/nova/nova-base/extend_start.sh
deleted file mode 100644
index eee0f16a1..000000000
--- a/docker/nova/nova-base/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/nova" ]]; then
-    mkdir -p /var/log/kolla/nova
-fi
-if [[ $(stat -c %a /var/log/kolla/nova) != "755" ]]; then
-    chmod 755 /var/log/kolla/nova
-fi
-
-. /usr/local/bin/kolla_nova_extend_start
diff --git a/docker/nova/nova-base/nova_sudoers b/docker/nova/nova-base/nova_sudoers
deleted file mode 100644
index 6d73da6d3..000000000
--- a/docker/nova/nova-base/nova_sudoers
+++ /dev/null
@@ -1 +0,0 @@
-nova ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/nova-rootwrap /etc/nova/rootwrap.conf *