aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJeffrey Zhang <zhang.lei.fly@gmail.com>2016-10-04 00:46:18 +0800
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-10-04 01:43:57 +0000
commitfb915b5a919b10993f150d9a1dc5da8edbaf29a0 (patch)
tree29ac1007477668260c7ec0653e8fe322923e3d0c /docker
parentf9f619d208413aee57309b7999227e05bcbf2e62 (diff)
downloadkolla-fb915b5a919b10993f150d9a1dc5da8edbaf29a0.tar.gz
kolla-fb915b5a919b10993f150d9a1dc5da8edbaf29a0.zip
Add hexdump package for ironic-conductor container
On RedHat family distro, util-linux provides the hexdump. On Debian family distro, bsdmainutils provides the hexdump. Change-Id: If762f570639782ca477ae4697f354d88c992613b Closes-Bug: #1627755
Diffstat (limited to 'docker')
-rw-r--r--docker/ironic/ironic-conductor/Dockerfile.j24
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index 00ddc40d5..2ece672b4 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -8,6 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set ironic_conductor_packages = [
+ 'util-linux',
'openstack-ironic-conductor',
'qemu-img',
'ipmitool',
@@ -17,6 +18,7 @@ MAINTAINER {{ maintainer }}
] %}
{% elif base_distro in ['ubuntu'] %}
{% set ironic_conductor_packages = [
+ 'bsdmainutils',
'ironic-conductor',
'qemu-utils',
'ipmitool',
@@ -28,6 +30,7 @@ MAINTAINER {{ maintainer }}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set ironic_conductor_packages = [
+ 'util-linux',
'qemu-img',
'ipmitool',
'parted',
@@ -37,6 +40,7 @@ MAINTAINER {{ maintainer }}
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set ironic_conductor_packages = [
+ 'bsdmainutils',
'qemu-utils',
'ipmitool',
'gdisk',