From fb915b5a919b10993f150d9a1dc5da8edbaf29a0 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Tue, 4 Oct 2016 00:46:18 +0800
Subject: [PATCH] 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
---
docker/ironic/ironic-conductor/Dockerfile.j2 | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index 00ddc40d53..2ece672b49 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',
--
GitLab