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, 204 deletions

diff --git a/docker/haproxy/haproxy-ssh/Dockerfile.j2 b/docker/haproxy/haproxy-ssh/Dockerfile.j2
deleted file mode 100644
index a674cc75e..000000000
--- a/docker/haproxy/haproxy-ssh/Dockerfile.j2
+++ /dev/null
@@ -1,42 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block haproxy_ssh_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='haproxy', shell='/bin/bash') }}
-
-{% if base_package_type == 'rpm' %}
-    {% set haproxy_ssh_packages = [
-        'openssh-server',
-        'openssh-clients',
-        'rsync',
-    ] %}
-
-{% elif base_package_type == 'deb' %}
-    {% set haproxy_ssh_packages = [
-        'openssh-server',
-        'openssh-client',
-        'rsync',
-    ] %}
-
-RUN mkdir -p /var/run/sshd \
-    && chmod 0755 /var/run/sshd
-
-{% endif %}
-
-{{ macros.install_packages(haproxy_ssh_packages | customizable("packages")) }}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start \
-    && sed -ri 's/session(\s+)required(\s+)pam_loginuid.so/session\1optional\2pam_loginuid.so/' /etc/pam.d/sshd
-
-COPY update-loadbalancer-cert.sh /usr/bin/update-loadbalancer-cert
-
-{{ macros.kolla_patch_sources() }}
-
-{% block haproxy_ssh_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/haproxy/haproxy-ssh/extend_start.sh b/docker/haproxy/haproxy-ssh/extend_start.sh
deleted file mode 100644
index 4b2239100..000000000
--- a/docker/haproxy/haproxy-ssh/extend_start.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-SSH_HOST_KEY_TYPES=( "rsa" "ecdsa" "ed25519" )
-
-for key_type in ${SSH_HOST_KEY_TYPES[@]}; do
-    KEY_PATH=/etc/ssh/ssh_host_${key_type}_key
-    if [[ ! -f "${KEY_PATH}" ]]; then
-        ssh-keygen -q -t ${key_type} -f ${KEY_PATH} -N ""
-    fi
-done
-
-mkdir -p /var/lib/haproxy/.ssh
-
-if [[ $(stat -c %U:%G /var/lib/haproxy/.ssh) != "haproxy:haproxy" ]]; then
-    chown haproxy: /var/lib/haproxy/.ssh
-fi
-
-FOLDERS_LEGO="/etc/letsencrypt /etc/letsencrypt/backups"
-USERGROUP="haproxy:haproxy"
-
-for folder in ${FOLDERS_LEGO}; do
-    mkdir -p ${folder}
-
-    if [[ $(stat -c %U:%G ${folder}) != "${USERGROUP}" ]]; then
-        chown ${USERGROUP} ${folder}
-    fi
-
-    if [[ "${folder}" == "/etc/letsencrypt" ]]; then
-        if [[ $(stat -c %a ${folder}) != "751" ]]; then
-            chmod 751 ${folder}
-        fi
-    else
-        if [[ $(stat -c %a ${folder}) != "755" ]]; then
-            chmod 755 ${folder}
-        fi
-    fi
-done
diff --git a/docker/haproxy/haproxy-ssh/update-loadbalancer-cert.sh b/docker/haproxy/haproxy-ssh/update-loadbalancer-cert.sh
deleted file mode 100755
index 7e4122c65..000000000
--- a/docker/haproxy/haproxy-ssh/update-loadbalancer-cert.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-
-function log_info {
-    local message="${1}"
-
-    echo "$(date '+%Y/%m/%d %H:%M:%S') [INFO] ${message}"
-}
-
-function log_error {
-    local message="${1}"
-
-    echo "$(date '+%Y/%m/%d %H:%M:%S') [ERROR] ${message}"
-}
-
-function haproxy_transaction_start {
-    local cert_input=${1}
-    local cert_dest=${2}
-
-    local transaction_result=""
-    local transaction_grep_check=""
-
-    transaction_grep_check="Transaction (created|updated) for certificate $(echo $cert_dest | sed -e 's|/|\\/|g')!"
-    transaction_result=$(echo -e "set ssl cert ${cert_dest} <<\n$(cat ${cert_input})\n" | socat unix-connect:/var/lib/kolla/haproxy/haproxy.sock -)
-    if echo "${transaction_result}" | grep -Pq "${transaction_grep_check}"; then
-        log_info "[${cert_dest} - update] Transaction ${cert_input} -> ${cert_dest} started."
-    else
-        log_error "[${cert_dest} - update] Transaction ${cert_input} -> ${cert_dest} failed, please check if haproxy admin socket is running and ${cert_input} is not corrupted."
-        exit 1
-    fi
-
-    local cert_input_sha1=""
-    local cert_dest_sha1=""
-
-    cert_input_sha1=$(openssl x509 -noout -fingerprint -sha1 -inform pem -in ${cert_input} | awk -F '=' '{print $2}' | sed -e 's/://g')
-    cert_dest_sha1=$(echo "show ssl cert *${cert_dest}" | socat unix-connect:/var/lib/kolla/haproxy/haproxy.sock - | awk -F 'SHA1 FingerPrint: ' '{print $2}' | sed '/^$/d')
-    if [ "${cert_input_sha1}" = "${cert_dest_sha1}" ]; then
-        log_info "[${cert_dest} - update] Transaction ${cert_input} -> ${cert_dest} successful."
-    else
-        log_error "[${cert_dest} - update] Transaction ${cert_input} -> ${cert_dest} failed, SHA1 fingerprint of ${cert_input} is not the same as uploaded one."
-        exit 1
-    fi
-}
-
-function haproxy_upload_to_memory {
-    local cert_input=${1}
-    local cert_dest=${2}
-
-    local cert_upload_output=""
-
-    cert_upload_output=$(echo "commit ssl cert ${cert_dest}" | socat unix-connect:/var/lib/kolla/haproxy/haproxy.sock -)
-    if echo "${cert_upload_output}" | grep -q "Success!"; then
-        log_info "[${cert_dest} - update] Certificate ${cert_input} uploaded to haproxy memory."
-    else
-        log_error "[${cert_dest} - update] Certificate ${cert_input} upload to haproxy memory failed, please check if haproxy admin socket is running and ${cert_input} is not corrupted."
-        exit 1
-    fi
-}
-
-function haproxy_write_to_disk {
-    local cert_input=${1}
-    local cert_haproxy_path=${2}
-
-    local cert_backup_suffix=""
-    local cert_backup_path=""
-    local cert_backup_name=""
-
-    cert_backup_suffix="-$(date +%Y-%m-%d-%H-%M-%S).pem"
-    cert_backup_path=$(echo "${cert_input}" | awk -v suffix="$cert_backup_suffix" -F '.pem' '{print $1suffix}')
-    cert_backup_name=$(echo ${cert_backup_path} | awk -F '/' '{print $NF}')
-    mkdir -p /etc/letsencrypt/backups
-    log_info "[${cert_haproxy_path} - update] Backuping currently loaded ${cert_haproxy_path} -> /etc/letsencrypt/backups/${cert_backup_name}"
-    cp -a ${cert_haproxy_path} /etc/letsencrypt/backups/${cert_backup_name}
-    cp -a ${cert_input} ${cert_haproxy_path}
-    rm -f ${cert_input}
-}
-
-
-# Parser
-
-INTERNAL_SET="false"
-EXTERNAL_SET="false"
-
-VALID_ARGS=$(getopt -o ie --long internal,external -- "$@")
-if [[ $? -ne 0 ]]; then
-    exit 1;
-fi
-
-eval set -- "$VALID_ARGS"
-while [ : ]; do
-    case "$1" in
-        -i | --internal)
-            CERT_TYPE="internal"
-            INTERNAL_SET="true"
-            shift
-            ;;
-        -e | --external)
-            CERT_TYPE="external"
-            EXTERNAL_SET="true"
-            shift
-            ;;
-        --) shift;
-            break
-            ;;
-    esac
-done
-
-if [ "${INTERNAL_SET}" = "true" ] || [ "${EXTERNAL_SET}" = "true" ]; then
-    if [ "${INTERNAL_SET}" = "${EXTERNAL_SET}" ]; then
-        echo "[e] Only --internal or --external parameter is allowed at a time"
-        exit 1
-    fi
-    if [ "${INTERNAL_SET}" = "true" ]; then
-        HAPROXY_CERT_INCOMING_PATH="/var/lib/haproxy/haproxy-internal.pem"
-        HAPROXY_CERT_PATH="/etc/haproxy/certificates/haproxy-internal.pem"
-    else
-        HAPROXY_CERT_INCOMING_PATH="/var/lib/haproxy/haproxy.pem"
-        HAPROXY_CERT_PATH="/etc/haproxy/certificates/haproxy.pem"
-    fi
-fi
-
-# Main
-
-haproxy_transaction_start ${HAPROXY_CERT_INCOMING_PATH} ${HAPROXY_CERT_PATH}
-haproxy_upload_to_memory ${HAPROXY_CERT_INCOMING_PATH} ${HAPROXY_CERT_PATH}
-haproxy_write_to_disk ${HAPROXY_CERT_INCOMING_PATH} ${HAPROXY_CERT_PATH}