From 397651ec4b5b93a55d0b8b8f69dfb37dd85cfc8d Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 29 Jan 2020 14:16:27 +0000
Subject: 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
---
 docker/ironic/ironic-conductor/Dockerfile.j2 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'docker')

diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index dece02e25..ee154ce17 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -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 %}
-- 
cgit v1.2.3