diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-30 17:29:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-30 17:29:11 +0000 |
| commit | 5c37a6d8c7009f153687fe69822c04a9cccaa3d0 (patch) | |
| tree | 7b684346f085082ea280e71afcd8ab689831b849 /docker | |
| parent | 4316793c5b76a8ce5b5194f7e4972a5ee1a4600e (diff) | |
| parent | 5244d7e21d1aed2200297c807c6ecf4ddf3dbc62 (diff) | |
| download | kolla-5c37a6d8c7009f153687fe69822c04a9cccaa3d0.tar.gz kolla-5c37a6d8c7009f153687fe69822c04a9cccaa3d0.zip | |
Merge "Add e2fsprogs and xfsprogs to ironic-conductor"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 7dbcbc54a..3fce16017 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -11,6 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build # python-seamicroclient, pyremotevbox package {% set ironic_conductor_packages = [ 'dosfstools', + 'e2fsprogs', 'gdisk', 'ipmitool', 'openstack-ironic-conductor', @@ -27,7 +28,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'qemu-img', 'shellinabox', 'socat', - 'util-linux' + 'util-linux', + 'xfsprogs', ] %} {% elif base_distro in ['debian', 'ubuntu'] %} # TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk, @@ -35,6 +37,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set ironic_conductor_packages = [ 'bsdmainutils', 'dosfstools', + 'e2fsprogs', 'gdisk', 'ipmitool', 'ironic-conductor', @@ -49,13 +52,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python-seamicroclient', 'qemu-utils', 'shellinabox', - 'socat' + 'socat', + 'xfsprogs', ] %} {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ironic_conductor_packages = [ 'dosfstools', + 'e2fsprogs', 'fuse', 'gdisk', 'ipmitool', @@ -64,19 +69,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'qemu-img', 'shellinabox', 'socat', - 'util-linux' + 'util-linux', + 'xfsprogs', ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set ironic_conductor_packages = [ 'bsdmainutils', 'dosfstools', + 'e2fsprogs', 'gdisk', 'ipmitool', 'parted', 'psmisc', 'qemu-utils', 'shellinabox', - 'socat' + 'socat', + 'xfsprogs', ] %} {% endif %} |