diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-17 16:00:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-17 16:00:36 +0000 |
| commit | 100c49d7b4c1ef84fcc6f82cd9e5e7508c4f3e2b (patch) | |
| tree | 0547cf687c416fecdde1ca26b807662a64aecfef /docker | |
| parent | b0b3f6a229c55aba86498850b391833aed876850 (diff) | |
| parent | e25c12fee6ea91c4aa3941988eedc707032d1d3a (diff) | |
| download | kolla-100c49d7b4c1ef84fcc6f82cd9e5e7508c4f3e2b.tar.gz kolla-100c49d7b4c1ef84fcc6f82cd9e5e7508c4f3e2b.zip | |
Merge "ironic-conductor: install ipmitool for source deploy in centos"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index f6ef39b1e..4372ff6ef 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -9,6 +9,12 @@ RUN yum -y install openstack-ironic-conductor \ {% endif %} {% elif install_type == 'source' %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + +RUN yum -y install ipmitool \ + && yum clean all + + {% endif %} {% if base_distro in ['ubuntu', 'debian'] %} RUN apt-get install -y --no-install-recommends \ |