openstack
/
kolla
Code Issues Proposed changes

Merge "CentOS 8: Allow SSH access to keystone_ssh and nova_ssh" into stable/train

This commit is contained in:
Zuul 2020-02-28 13:49:11 +00:00 committed by Gerrit Code Review
parent c2102c4223 2bb38f156b
commit 544894731c
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/keystone/keystone-ssh/Dockerfile.j2
View File

@ -12,6 +12,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openssh-server',
'rsync'
] %}
{% if distro_package_manager == 'dnf' %}
# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which
# prevents SSH access to it.
RUN rm -f /run/nologin
{% endif %}
{% elif base_package_type == 'deb' %}
{% set keystone_ssh_packages = [
'openssh-server',

10
docker/nova/nova-ssh/Dockerfile.j2
View File

@ -11,7 +11,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openssh-server'
] %}
{% if base_package_type == 'deb' %}
{% if base_package_type == 'rpm' %}
{% if distro_package_manager == 'dnf' %}
# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which
# prevents SSH access to it.
RUN rm -f /run/nologin
{% endif %}
{% elif base_package_type == 'deb' %}
RUN mkdir -p /var/run/sshd \
&& chmod 0755 /var/run/sshd