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>

2 files changed, 0 insertions, 117 deletions

diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
deleted file mode 100644
index 8b3c1bcfe..000000000
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ /dev/null
@@ -1,112 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block nova_compute_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-
-{{ macros.enable_extra_repos(['ceph', 'epel']) }}
-
-    {% set nova_compute_packages = [
-        'ceph-common',
-        'cyrus-sasl-md5',
-        'cyrus-sasl-scram',
-        'device-mapper-multipath',
-        'dosfstools',
-        'e2fsprogs',
-        'genisoimage',
-        'iscsi-initiator-utils',
-        'libosinfo',
-        'ndctl',
-        'nfs-utils',
-        'nvme-cli',
-        'parted',
-        'python3-libguestfs',
-        'python3-libvirt',
-        'python3-rtslib',
-        'qemu-img',
-        'qemu-kvm-block-rbd',
-        'rsync',
-        'sysfsutils',
-        'targetcli',
-        'xfsprogs'
-    ] %}
-
-    # NOTE(hrw): daxio is part of pmdk which is x86-64 only in CentOS 8
-    {% if base_arch == 'x86_64' %}
-        {% set nova_compute_packages = nova_compute_packages + [
-            'daxio'
-        ] %}
-    {% endif %}
-
-{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
-
-{% elif base_package_type == 'deb' %}
-
-    {% set nova_compute_packages = [
-        'ceph-common',
-        'dosfstools',
-        'e2fsprogs',
-        'genisoimage',
-        'libosinfo-bin',
-        'libsasl2-modules-gssapi-mit',
-        'multipath-tools',
-        'ndctl',
-        'nfs-common',
-        'nvme-cli',
-        'open-iscsi',
-        'parted',
-        'pmdk-tools',
-        'python3-cephfs',
-        'python3-guestfs',
-        'python3-libvirt',
-        'python3-rados',
-        'python3-rbd',
-        'python3-rtslib-fb',
-        'qemu-block-extra',
-        'qemu-utils',
-        'rsync',
-        'sasl2-bin',
-        'swtpm',
-        'swtpm-tools',
-        'sysfsutils',
-        'targetcli-fb',
-        'tpm2-tools',
-        'xfsprogs'
-    ] %}
-
-RUN mkdir -p /etc/ceph \
-    && {{ macros.install_packages(nova_compute_packages | customizable("packages"), chain=True) }}
-
-{% endif %}
-
-{% set nova_compute_pip_packages = [
-        'oslo-vmware'
-    ]
-%}
-
-{% set nova_compute_plugins_pip_packages = [
-    '/plugins/*'
-] %}
-
-ADD plugins-archive /
-
-COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start
-
-RUN {{ macros.install_pip(nova_compute_pip_packages | customizable("pip_packages")) }} \
-    && if [ "$(ls /plugins)" ]; then \
-           {{ macros.install_pip(nova_compute_plugins_pip_packages) }}; \
-       fi \
-    && chmod 644 /usr/local/bin/kolla_nova_extend_start \
-    && rm -f /etc/machine-id
-
-{{ macros.kolla_patch_sources() }}
-
-{% block nova_compute_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER nova
diff --git a/docker/nova/nova-compute/extend_start.sh b/docker/nova/nova-compute/extend_start.sh
deleted file mode 100644
index a458625ec..000000000
--- a/docker/nova/nova-compute/extend_start.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d /var/lib/nova/instances ]]; then
-    mkdir -p /var/lib/nova/instances
-fi