diff options
| author | Zuul <zuul@review.opendev.org> | 2026-07-08 16:33:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-07-08 16:33:45 +0000 |
| commit | 44b4d81399792f539716618953f2cafa64086a5c (patch) | |
| tree | 4699d7e068e6dd842a9f1f247ca2f150d60d5e27 /docker/nova/nova-ssh | |
| parent | b3803eb9f951acd63018ab8ba69bcbd1a2de5c93 (diff) | |
| parent | db35ac8d793506bc43b62e7e39d27a75de1043ed (diff) | |
| download | kolla-44b4d81399792f539716618953f2cafa64086a5c.tar.gz kolla-44b4d81399792f539716618953f2cafa64086a5c.zip | |
Merge "Migrate to pyproject.toml"
Diffstat (limited to 'docker/nova/nova-ssh')
| -rw-r--r-- | docker/nova/nova-ssh/Dockerfile.j2 | 34 | ||||
| -rw-r--r-- | docker/nova/nova-ssh/extend_start.sh | 16 |
2 files changed, 0 insertions, 50 deletions
diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 deleted file mode 100644 index 0d9e36b65..000000000 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ /dev/null @@ -1,34 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block nova_ssh_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='nova', shell='/bin/bash') }} - -{% set nova_ssh_packages = [ - 'openssh-server', - 'rsync' -] %} - -{% if base_package_type == 'deb' %} - -RUN mkdir -p /var/run/sshd \ - && chmod 0755 /var/run/sshd - -{% endif %} - -{{ macros.install_packages(nova_ssh_packages | customizable("packages")) }} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN sed -ri 's/session(\s+)required(\s+)pam_loginuid.so/session\1optional\2pam_loginuid.so/' /etc/pam.d/sshd \ - && chmod 644 /usr/local/bin/kolla_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block nova_ssh_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/nova/nova-ssh/extend_start.sh b/docker/nova/nova-ssh/extend_start.sh deleted file mode 100644 index b80114c0a..000000000 --- a/docker/nova/nova-ssh/extend_start.sh +++ /dev/null @@ -1,16 +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/nova/.ssh - -if [[ $(stat -c %U:%G /var/lib/nova/.ssh) != "nova:nova" ]]; then - chown nova: /var/lib/nova/.ssh -fi |