openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add hexdump package for ironic-conductor container"

Browse Source
This commit is contained in:
Jenkins 2016-10-04 04:07:09 +00:00 committed by Gerrit Code Review
commit 734cfd02c3
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

@ -8,6 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'util-linux',
'openstack-ironic-conductor', 'openstack-ironic-conductor',
'qemu-img', 'qemu-img',
'ipmitool', 'ipmitool',
@ -17,6 +18,7 @@ MAINTAINER {{ maintainer }}
] %} ] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'bsdmainutils',
'ironic-conductor', 'ironic-conductor',
'qemu-utils', 'qemu-utils',
'ipmitool', 'ipmitool',
@ -28,6 +30,7 @@ MAINTAINER {{ maintainer }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'util-linux',
'qemu-img', 'qemu-img',
'ipmitool', 'ipmitool',
'parted', 'parted',
@ -37,6 +40,7 @@ MAINTAINER {{ maintainer }}
] %} ] %}
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'bsdmainutils',
'qemu-utils', 'qemu-utils',
'ipmitool', 'ipmitool',
'gdisk', 'gdisk',