aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-21 21:30:19 +0000
committerGerrit Code Review <review@openstack.org>2016-11-21 21:30:19 +0000
commit93f934c1d6766f811930d173fa3d33f208d03057 (patch)
treef2d50bac5f43bd200e99ea6cb2d1bea35dc20cfb
parent3f883df4acbd53f04f15229886d2287f28573123 (diff)
parentabca6a93b73aafb9998dc54a250d74323761b17c (diff)
downloadkolla-93f934c1d6766f811930d173fa3d33f208d03057.tar.gz
kolla-93f934c1d6766f811930d173fa3d33f208d03057.zip
Merge "Install mkfs.vfat tool in ironic-conductor image"
-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 3e3f7d315..f97e0e475 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -10,6 +10,7 @@ MAINTAINER {{ maintainer }}
# TODO(Jeffrey4l): no python-scciclient, python-oneviewclient,
# python-seamicroclient, pyremotevbox package
{% set ironic_conductor_packages = [
+ 'dosfstools',
'util-linux',
'openstack-ironic-conductor',
'qemu-img',
@@ -31,6 +32,7 @@ MAINTAINER {{ maintainer }}
# pyremotevbox, ImcSdk package
{% set ironic_conductor_packages = [
'bsdmainutils',
+ 'dosfstools',
'ironic-conductor',
'qemu-utils',
'ipmitool',
@@ -49,6 +51,7 @@ MAINTAINER {{ maintainer }}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ironic_conductor_packages = [
+ 'dosfstools'
'util-linux',
'qemu-img',
'ipmitool',
@@ -60,6 +63,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set ironic_conductor_packages = [
'bsdmainutils',
+ 'dosfstools',
'qemu-utils',
'ipmitool',
'gdisk',