From db35ac8d793506bc43b62e7e39d27a75de1043ed Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 6 Jul 2026 15:26:00 +0200 Subject: 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 --- docker/haproxy/haproxy-ssh/extend_start.sh | 37 ------------------------------ 1 file changed, 37 deletions(-) delete mode 100644 docker/haproxy/haproxy-ssh/extend_start.sh (limited to 'docker/haproxy/haproxy-ssh/extend_start.sh') 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 -- cgit v1.2.3