openstack
/
kolla
Code Issues Proposed changes

CentOS 8: Remove shellinabox from ironic-conductor 

shellinabox is used by ironic-conductor to provide a browser-based shell
to access the consoles of nodes. It is not used by all console drivers,
and is not used in the integration with nova serial consoles.

The package was previously installed from EPEL7, but is not currently
provided by EPEL8.

This change removes the package to allow the ironic-conductor image to
build.

Change-Id: I210d9fddd6948dab1feb5abf59a50bce86f21f0f
Partially-Implements: blueprint centos-rhel-8
This commit is contained in:
Mark Goddard 2020-01-29 14:16:27 +00:00
parent 4b4e26262b
commit 397651ec4b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/ironic/ironic-conductor/Dockerfile.j2
View File

@ -19,11 +19,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openstack-ironic-staging-drivers',
'parted',
'psmisc',
'shellinabox',
'util-linux',
'xfsprogs'
] %}
# FIXME(mgoddard): Removed shellinabox which is not currently provided
# by EPEL8.
{% if distro_python_version.startswith('3') %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'python3dist\(ansible\)',
@ -46,6 +47,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python-scciclient',
'python-sushy',
'python2-ImcSdk',
'shellinabox',
'systemd-python'
] %}
{% endif %}
@ -92,16 +94,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'ipmitool',
'parted',
'psmisc',
'shellinabox',
'util-linux',
'xfsprogs',
] %}
# FIXME(mgoddard): Removed shellinabox which is not currently provided
# by EPEL8.
{% if distro_python_version.startswith('3') %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'systemd-udev',
] %}
{% else %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'shellinabox',
'systemd',
] %}
{% endif %}

1
kolla/image/build.py
View File

@ -153,7 +153,6 @@ UNBUILDABLE_IMAGES = {
"glance-base", # Missing Ceph repo
"gnocchi-base", # Missing Ceph repo
"hacluster-base", # Missing hacluster repo
"ironic-conductor", # Missing shellinabox package
"kibana", # Missing elasticsearch repo
"manila-share", # Missing Ceph repo
"mongodb", # Missing mongodb and mongodb-server packages