diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-26 23:56:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-26 23:56:44 +0000 |
| commit | 3852721c819a0dc461192d8629adc001e0425ac8 (patch) | |
| tree | 1c82e9ef7f396895c6fdb20866423fc2bc1381cb /docker | |
| parent | dd71b98d81540436fb82ae85e969ea5919ffa9b8 (diff) | |
| parent | 69fc0bbde726075fe41b5029ca60eb65f7dc5f57 (diff) | |
| download | kolla-3852721c819a0dc461192d8629adc001e0425ac8.tar.gz kolla-3852721c819a0dc461192d8629adc001e0425ac8.zip | |
Merge "Add required packages to ironic-conductor container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 340a13000..f6ef39b1e 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -8,6 +8,15 @@ RUN yum -y install openstack-ironic-conductor \ && yum clean all {% endif %} +{% elif install_type == 'source' %} + {% if base_distro in ['ubuntu', 'debian'] %} + +RUN apt-get install -y --no-install-recommends \ + qemu-utils \ + ipmitool \ + && apt-get clean + + {% endif %} {% endif %} {{ include_footer }} |