openstack/kolla
Code Issues Proposed changes

CentOS 8: Allow SSH access to keystone_ssh and nova_ssh

Browse Source 
The centos:8 image contains a /run/nologin file, which prevents SSH
access to it. Remove this file in the keystone_ssh and nova_ssh images
to allow login via SSH.

Change-Id: I59dc2c4207af6812501b6c6acdb34e51a3e848c4
Partially-Implements: blueprint centos-rhel-8
This commit is contained in:
Mark Goddard 2020-01-29 17:04:43 +00:00
parent 70423f1959
commit 892ae92d97
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', 'openssh-server',
'rsync' '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' %} {% elif base_package_type == 'deb' %}
{% set keystone_ssh_packages = [ {% set keystone_ssh_packages = [
'openssh-server', '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' '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 \ RUN mkdir -p /var/run/sshd \
&& chmod 0755 /var/run/sshd && chmod 0755 /var/run/sshd