openstack
/
kolla
Code Issues Proposed changes

Add e2fsprogs and xfsprogs to ironic-conductor 

These are required for formatting ext and XFS ephemeral disk partitions
when using the iSCSI deployment drivers.

Change-Id: Icd187cdd1eb0cb36fbda6c04304bd25d31199bd7
Closes-Bug: #1701320
(cherry picked from commit 5244d7e21d)
This commit is contained in:
Mark Goddard 2017-06-29 12:11:26 +01:00 committed by Jeffrey Zhang
parent d2df6f7b2e
commit 63bc75db16
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ MAINTAINER {{ maintainer }}
# python-seamicroclient, pyremotevbox package # python-seamicroclient, pyremotevbox package
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'dosfstools', 'dosfstools',
'e2fsprogs',
'util-linux', 'util-linux',
'openstack-ironic-conductor', 'openstack-ironic-conductor',
'qemu-img', 'qemu-img',
@ -27,7 +28,8 @@ MAINTAINER {{ maintainer }}
'openwsman-python', 'openwsman-python',
'python2-ImcSdk', 'python2-ImcSdk',
'shellinabox', 'shellinabox',
'socat' 'socat',
'xfsprogs'
] %} ] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
# TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk, # TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk,
@ -35,6 +37,7 @@ MAINTAINER {{ maintainer }}
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'bsdmainutils', 'bsdmainutils',
'dosfstools', 'dosfstools',
'e2fsprogs',
'ironic-conductor', 'ironic-conductor',
'qemu-utils', 'qemu-utils',
'ipmitool', 'ipmitool',
@ -49,13 +52,15 @@ MAINTAINER {{ maintainer }}
'python-seamicroclient', 'python-seamicroclient',
'python-openwsman', 'python-openwsman',
'shellinabox', 'shellinabox',
'socat' 'socat',
'xfsprogs'
] %} ] %}
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'dosfstools', 'dosfstools',
'e2fsprogs',
'util-linux', 'util-linux',
'qemu-img', 'qemu-img',
'ipmitool', 'ipmitool',
@ -64,19 +69,22 @@ MAINTAINER {{ maintainer }}
'psmisc', 'psmisc',
'fuse', 'fuse',
'shellinabox', 'shellinabox',
'socat' 'socat',
'xfsprogs'
] %} ] %}
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'bsdmainutils', 'bsdmainutils',
'dosfstools', 'dosfstools',
'e2fsprogs',
'qemu-utils', 'qemu-utils',
'ipmitool', 'ipmitool',
'gdisk', 'gdisk',
'psmisc', 'psmisc',
'parted', 'parted',
'shellinabox', 'shellinabox',
'socat' 'socat',
'xfsprogs'
] %} ] %}
{% endif %} {% endif %}
RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt -r /ironic/driver-requirements.txt RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt -r /ironic/driver-requirements.txt