diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-28 10:27:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-28 10:27:06 +0000 |
| commit | 868b89ea22db0281ff70d9a3014642d5509498df (patch) | |
| tree | a667bf146f928ac3da1a7692611f2d91056a979e /docker | |
| parent | 594f468bad94f50c2451d450e3c241aa08bf7f07 (diff) | |
| parent | 27ed7f231d15a01d0bd8b62c557ab5f5875289c2 (diff) | |
| download | kolla-868b89ea22db0281ff70d9a3014642d5509498df.tar.gz kolla-868b89ea22db0281ff70d9a3014642d5509498df.zip | |
Merge "CentOS 8: Remove shellinabox from ironic-conductor" into stable/train
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index ab5adc342..8df44e618 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -17,11 +17,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\)', @@ -44,6 +45,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python-scciclient', 'python-sushy', 'python2-ImcSdk', + 'shellinabox', 'systemd-python' ] %} {% endif %} @@ -90,16 +92,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 %} |