openstack/kolla
Code Issues Proposed changes

Merge "Install mkfs.vfat tool in ironic-conductor image"

Browse Source
This commit is contained in:
Jenkins 2016-11-21 21:30:19 +00:00 committed by Gerrit Code Review
commit 93f934c1d6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ MAINTAINER {{ maintainer }}
# TODO(Jeffrey4l): no python-scciclient, python-oneviewclient, # TODO(Jeffrey4l): no python-scciclient, python-oneviewclient,
# python-seamicroclient, pyremotevbox package # python-seamicroclient, pyremotevbox package
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'dosfstools',
'util-linux', 'util-linux',
'openstack-ironic-conductor', 'openstack-ironic-conductor',
'qemu-img', 'qemu-img',
@ -31,6 +32,7 @@ MAINTAINER {{ maintainer }}
# pyremotevbox, ImcSdk package # pyremotevbox, ImcSdk package
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'bsdmainutils', 'bsdmainutils',
'dosfstools',
'ironic-conductor', 'ironic-conductor',
'qemu-utils', 'qemu-utils',
'ipmitool', 'ipmitool',
@ -49,6 +51,7 @@ MAINTAINER {{ maintainer }}
{% 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'
'util-linux', 'util-linux',
'qemu-img', 'qemu-img',
'ipmitool', 'ipmitool',
@ -60,6 +63,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'bsdmainutils', 'bsdmainutils',
'dosfstools',
'qemu-utils', 'qemu-utils',
'ipmitool', 'ipmitool',
'gdisk', 'gdisk',